Merge cherrypicks of [17614692] into rvc-platform-release. am: ce02568a14

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

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