[automerger skipped] Merge changes from topic "presubmit-am-7d8337c3813a47e19898b70f395cf7ea-git_mainline-module-media_swcodec-release-rvc-qpr-dev-sc-dev" into tm-dev am: 50b881083a -s ours

am skip reason: Merged-In I64e7fe1b258be2f59c6d39c0b7b699fa881d79e6 with SHA-1 067929dcd3 is already in history

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

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