[automerger skipped] Merge "Merge Android 12L" am: f7aacd89ab -s ours

am skip reason: Merged-In I5929c021e25cfda8574e9691b267733d598ddc09 with SHA-1 51cf496bc9 is already in history

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

Change-Id: Ifbf4db31b8b3b145fda5457c468bab3352875cbe