[automerger skipped] Merge Android 12L am: 94ce1fc5ca -s ours

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

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

Change-Id: I034c722d4228d657d6a49288f440d0fa6e832c69