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

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



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