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

Merge "Merge changes from topic "c2bq-issues" into tm-dev am: ffa5de33 am: 655395c0 am: c8669b1e" into tm-qpr-dev-plus-aosp am: b4fbb52d

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



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