[automerger skipped] C2BqBuffer: resolve 3 way deadlock am: bdd0230f -s ours...

[automerger skipped] C2BqBuffer: resolve 3 way deadlock am: bdd0230f -s ours am: 41c369ca -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: I857f787b7ffdfd26b5b86d0b2b00ab71ffc9a252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>