Merge changes from topic "c2bq-issues" into tm-dev am: ffa5de33 am: 539d466d

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



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