Merge "Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take...

Merge "Merge "Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3 am: bfaa2fed" into rvc-d1-dev-plus-aosp am: 2f1e6f9b" into rvc-qpr-dev-plus-aosp am: 832abad3

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

Change-Id: Ia2c9c449019110de7fe4ce1532c70fcf615c3113