Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a2746525 am: f7f596f9 am: 14125083

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

Change-Id: I1c5cc319b9193d621d38902af1f0faef25361881