[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 7cec9a573d -s ours

am skip reason: Merged-In I7b7e0cddc60d256fa5afce5220129f1fa6a95199 with SHA-1 90f46b2889 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/31817370

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