[automerger skipped] Merge 10952656 am: c562aca7 -s ours

am skip reason: Merged-In Icfe2dfd94527527939e01aa6231a69ce1888b8ab with SHA-1 38abecbe is already in history

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



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