Merge "C2BqBuffer: fix to check consumer usage when migrating during surface...

Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into main am: 35672ce5

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



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