[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: dc1f5ca4 -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: I420757a663fe0b254a4c002bf5e7c50c1bac2c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>