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

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

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



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