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