Merge "Add FCC_12 for 12 audio channels" am: f9c78425b4 am: 28a50ad799 am: 13c06a3eec

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1316086

Change-Id: I2fc53b6febd00dd5a3c5fb88660f9ce81950a73d