[automerger skipped] Merge "C2BqPool: Expire waiters on Surface switching"...

[automerger skipped] Merge "C2BqPool: Expire waiters on Surface switching" into main am: d37e465f am: 3ab10d36 -s ours am: 79d4ef14 -s ours am: 5dfadeec -s ours am: 53ac6c4c -s ours

am skip reason: Merged-In I8f0a9adace5f53fe7f47179b425bb899abcec64f with SHA-1 7c68c1b9 is already in history

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



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