[automerger skipped] Merge "Merge Android 12 QPR 3" am: 112278a6 -s ours am: ee78c6ef -s ours

am skip reason: Merged-In Iaa97a03bc18f72e3dfb4cc6600cbec8f2cc876e1 with SHA-1 2bdebb91 is already in history

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



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