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

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

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