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

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

Change-Id: I6fe77e372a8bd50ef935ae362216f96fe6fc1c83