Merge changes from topic "cherrypicker-L39500000954920408:N18000001270979175"...

Merge changes from topic "cherrypicker-L39500000954920408:N18000001270979175" into tm-dev am: e5f336fa

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



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