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

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

Change-Id: I7ff327daf9f94cea07f8ddab110b51e6fe6e3447