Merge "Enable 12 channel decoding of raw audio format" into main am: edf33cead5 am: 7a0616fe53

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

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