[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 9a790c46e4 -s ours am skip reason: Merged-In Id31f5d13a2b11a173887d417029375215eaf6abd with SHA-1 316ba7c659 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/27908433 Change-Id: Id9dab875692c63a32bb23cf50f3da086767ed85e Signed-off-by: Automerger Merge Worker <[email protected]>