Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master