Merge "Phone fails to switch channel mode from stereo to mono" into...

Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126 am: ebc8a9fd am: 04e10ffc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I073a5c88f41f227c315ac072ad026b6be424efda