[automerger skipped] Merge Android 12L am: 94ce1fc5 -s ours am: c15fec9b...

[automerger skipped] Merge Android 12L am: 94ce1fc5 -s ours am: c15fec9b -s ours am: f635aaa8 -s ours

am skip reason: Merged-In I968601ea0aef02f03ecfc0d09049efb13ecda483 with SHA-1 ccb3f81f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2013182

Change-Id: I0ad106a6155ac6f82512512a979b4d49c05f945d