Merge "Enable 12 channel decoding of raw audio format" into main am:...

Merge "Enable 12 channel decoding of raw audio format" into main am: edf33cea am: 7a0616fe am: 8ffacf69

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



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