Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-mainline-prod am: ba9660a658 am: 7d85c74084

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

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