Merge "[BBQ] Only wait when acquiring a buffer if in a sync." into tm-qpr-dev am: b567cd1737

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

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