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

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

Change-Id: Icb4bc0bd4382c6a0a7d330624bc371d009efc1c6