[automerger skipped] Merge "Add libgui bq_consumer_attach_callback flag" into main am: a0bbe3d4 -s ours

am skip reason: Merged-In Ieaa25ed05d04a33de47de7ee3296e4bf1dde7a26 with SHA-1 dd7c1cf2 is already in history

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



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