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: 132d6738" into tm-d1-dev-plus-aosp am: 730be991 am: 47dcf28c

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



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