[automerger skipped] Merge "Merge Android 12 QPR 3" am: cb00f5235d -s ours am: 5ccfd6ac78 -s ours am: 1a013376bd -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: I42c52aac9bcff66d7dbeb5da3964bc1039827306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>