Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2231acfd62

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

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