[automerger skipped] Merge Android 12 QPR 3 am: aea43810 -s ours am: 489a9b86 -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: Ie74806e9c5301e3ad211011e62f6a5c52304d8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>