Merge changes from topics "24ch Audio HAL", "360RA HAL" am: 2092162bc3

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1677774

Change-Id: Ia67334793f22e2bc5e1c449fa029169fd831cacb