[automerger skipped] Merge "Merge Android 12 QPR1" am: b6838ad8 -s ours am: 1bb0d687 -s ours am: d6c41481 -s ours

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

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

Change-Id: Idc8da3b8baecc7cfeccd2b393eca8b3804550fc4