Merge "Merge "AAC C2 decoder: add channel mask in output format change" into...

Merge "Merge "AAC C2 decoder: add channel mask in output format change" into tm-dev am: 0665da9b am: 04104255 am: 040619bc" into tm-qpr-dev-plus-aosp am: dc5c9f78

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18561279



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