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

[automerger skipped] C2BqBuffer: fix to check consumer usage when migrating during surface change am: c1d484b3 -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: I3c5a98ac7e67c5e5e27df14d3fa85b715e0f1d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>