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 am: 1cf68fcb

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



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