Merge changes from topics "24ch Audio HAL", "360RA HAL" am: e7424e0fd1 am: 2d57c30196 am: 69e8e354d4 am: 8b4db0ce38

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

Change-Id: Ia2ec93245d23f2d2ff993c5510f849f17c42f129