[automerger skipped] Merge "Add libgui bq_consumer_attach_callback flag" into...

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

am skip reason: Merged-In I3268cb82fdc7d194f8b1864b8a72147ff51e3973 with SHA-1 d6aef5c3 is already in history

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



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