[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: f91f699b -s ours am: 606ec1b0 -s ours

am skip reason: Merged-In Ibbeb1c1e066ac2b41a370539c7f85ac7937f1d4c with SHA-1 e3e4f94e is already in history

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



Change-Id: I2dd1f666916360bdf7a521bda7c324b888ddb3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>