[automerger skipped] Merge "C2BqBuffer: resolve 3 way deadlock" into...

[automerger skipped] Merge "C2BqBuffer: resolve 3 way deadlock" into tm-qpr-dev am: 5fc008b6 -s ours am: a1349a2c -s ours

am skip reason: Merged-In I6a9540d3b4d03806cd40bb4f89a234a6b77758a9 with SHA-1 d36be3a0 is already in history

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



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