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

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

Change-Id: I1261f696aa6d7a74c6b5bcdcc6e961fb7302d760