[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-fa3fe6574fa54a1ebf9c5b5035a68189" into sc-qpr1-dev am: 591382df am: d2af9f40 am: b2dba023 am: 0adfeafe am: f9daf2f8 am: f4ac0130 -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: Id4a88dc373ab7a0244ea334e6195f9ed652be261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>