Merge "Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev...

Merge "Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f4 am: 6732f258" into rvc-d1-dev-plus-aosp am: bf575be5 am: 84d71ee7

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

Change-Id: Ic39e998a7c0c41948c738cbb79d687b4b6c537cf