Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into...

Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into udc-mainline-prod am: 590ddb9c

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



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