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

Merge changes from topic "c2bq-issues" into tm-dev am: ffa5de33 am: 655395c0 am: 3b7c7ab0 am: 79887415

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



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