Merge "AudioSystem: update framework channel capabilities" am: 249034de9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I08673eeab82f21743b35d4cf9c1fc001a72cb038