Merge "C2BqBuffer: resolve 3 way deadlock" am: e8478652 am: e50a2706 am: a31f7f96

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



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