Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee

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

Change-Id: I2499cd268896b11b78d6828142749dda181b1a0b