[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 1f830f7196 -s ours am: 456ba9e186 -s ours am: 9192d46a8a -s ours

am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 23ef1ac38c is already in history

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

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