[automerger skipped] Merge Android 12L am: 349d7b57b1 -s ours am: 1d431a7dae -s ours am: 69ee95d4a1 -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: If14dbf5be3d6a218c9a5c285dea44c89d4ec655a