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

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

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



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