Merge "Merge "Revert "Camera: Add lastCompletedFrameNumber in CaptureResultExtras"" into rvc-dev am: 49509200 am: 8a69a0fd am: 1d614304" into rvc-qpr-dev-plus-aosp am: 9fbed3b7

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

Change-Id: Ic159f33049f559f93a08fc9afb58f3d384bef944