Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master