[automerger skipped] Merge "[BBQ] Only wait when acquiring a buffer if in a...

[automerger skipped] Merge "[BBQ] Only wait when acquiring a buffer if in a sync." into tm-qpr-dev am: b567cd17 am: 14156163 -s ours

am skip reason: Merged-In I11a81a440bc0d22ba85bcf4d4a068b853ca5cf9c with SHA-1 3a8f19bd is already in history

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



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