[automerger skipped] Merge "libaudiohal: Add support for audio@7.1" am:...

[automerger skipped] Merge "libaudiohal: Add support for audio@7.1" am: 16f5a450 am: 943480e8 am: 91237018 am: 5edb8f70 -s ours

am skip reason: Merged-In I62f72dc86dee472d6b358a9861882b9b7f6c6177 with SHA-1 6718c396 is already in history

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

Change-Id: Ie11b233058b5df5c69891e58cbbeaa8202d687b1