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

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

Change-Id: Id0480201f7ef2b08c4c59f14148a21df4ef83cc0