Merge "C2BqBuffer: resolve 3 way deadlock" am: e847865272 am: e50a2706f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2285818

Change-Id: I561f107a69a767f0885cdf7071531fca8b28adb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>