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