Merge changes from topics...

Merge changes from topics "cherrypicker-L37600000955090666:N36200001273131748", "cherrypicker-L79000000955070414:N24400001272804687" into tm-dev am: f51f239b am: 7c0a8745

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



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