Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into...

Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-mainline-prod am: ba9660a6 am: 7d85c740 am: 2e88d483 am: 6426aeda

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



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