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

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

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

Change-Id: I547ef8d62f8802ce02288dfdc915ff7b44825015