Merge "Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into...

Merge "Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a2746525 am: 7fbce095 am: 8a6442ec" into rvc-qpr-dev-plus-aosp am: b1a657cf

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

Change-Id: I7ba38a32e1fcfc8d6ee8316eba230e663cc5895f