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