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: If9e5101ba7563729a7a47f1321891089472ad01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>