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

Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into main am: 444cbbba am: 1661ea88 am: 2f6837ec

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



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