[automerger skipped] Merge Android 12 QPR 3 am: 0ace73f2d3 -s ours

am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004

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