[automerger skipped] Merge "Merge Android 12 QPR1" am: b6838ad8ad -s ours

am skip reason: Merged-In I335749953fc8b0200708ea59dcc328531d09017f with SHA-1 8ca1bd9157 is already in history

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

Change-Id: Ic99b7d4eccff4f8347e1f4dc68252b3399fe5b25