[automerger skipped] Merge "Merge Android 12L" am: 559ec6155c -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: I5dcd3531a4f1fc31b659d05998d434dacfae50a5