Merge "AudioSystem: update framework channel capabilities" am: 249034de9d am: 67143814c2 am: 4245889bbd

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

Change-Id: I30f6dd9c16b1168bf263f94498a3993a4bfe7b45