Merge "Merge "Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)" into rvc-dev am: 2e2461eab5 am: 80844b8c6e" into rvc-d1-dev-plus-aosp am: 14257822a6

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

Change-Id: I9edb35d81c9586e95a881b9fee317e5014aec7fb