[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ba655811 -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: ba655811 -s ours am: fdfb47f1 -s ours am: c430dd51 -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: I9f2305532454829601f0f7bde62ba41634f3bcb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>