[automerger skipped] Merge "BlastBufferQueue: Fix async worker deadlock" am: 09fe4d2cc0 am: b40813fb70 am: d2a1d62d37 -s ours am: eaa4827482 -s ours

am skip reason: Merged-In I40d163c3644c6a0128936cf41e8bf8969766d9da with SHA-1 51e4dc89f0 is already in history

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

Change-Id: I02562d44ae90401c8c0786554151be7d0b98d404