[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-mainline-prod am: ba9660a6 am: 7d85c740 am: 00cc792a am: d790cfaf am: 17c0c787 -s ours

am skip reason: Merged-In I2e2084e85fe45d7d7f958c59b0063a477c7d24bf with SHA-1 0390207e is already in history

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



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