Merge "Revert "Camera: Add lastCompletedFrameNumber in CaptureResultExtras"" into rvc-dev am: 49509200 am: 9643a5ae am: cc2cf329 am: 3da5f53a

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

Change-Id: I5d6ac76971a699ad7e1814dba9bd7ca016c44ed3