Merge "Merge "Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)" into rvc-dev am: 2e2461eab5 am: 26a6bc660c am: 6c56eb5f3e" into rvc-qpr-dev-plus-aosp am: 5f5c18c710

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11835321

Change-Id: I9358c7a3dfc2f0625332ffc18b8146aae3594a15