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

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

Change-Id: I793d4bcf61e19c047002213d7a1a03854879b9fa