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

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

Change-Id: Id37ff7b4dea3eb66109ecd0274b35d6dab968f7d