[automerger skipped] Merge "C2BqBuffer: fix to check consumer usage when...

[automerger skipped] Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into android15-tests-dev am: ead7231a -s ours am: b8bc3d64 -s ours am: 60bccde3 -s ours

am skip reason: Merged-In I7f2ed15faab87d833da8ace4923c735e6e7a5407 with SHA-1 8a007370 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3412160



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