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

Merge "AAC C2 decoder: add channel mask in output format change" into tm-dev am: 0665da9b am: 2052c045

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



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