Merge changes from topic "c2bq-defer-clear" into main am: 4f195983 am: a824dee4

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



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