Merge "libaudiohal: Add support for audio@7.1" am: 16f5a4508d am: 943480e807

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1973105

Change-Id: Ifeb4e642c02883ea0c24c40883fc7d6e7fa380f8