[automerger skipped] Merge "BQ: Fix deadlock introduced by onFrameDequeued"...

[automerger skipped] Merge "BQ: Fix deadlock introduced by onFrameDequeued" into udc-d1-dev am: 6f1dcd5a am: a1b8de38 -s ours am: f0f4330b -s ours

am skip reason: Merged-In I22fdc637ccc937594656d6f5bc1ee9b7c506490a with SHA-1 266f31ae is already in history

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



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