[automerger skipped] Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6
am: ebc8a9fd1c
am: 04e10ffc28
am: 8c5137e3b3
-s ours
am skip reason: Merged-In Iae4aa3f1d77350f5b4d91e7a687e048091c1daea with SHA-1 1469626b4a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380
Change-Id: I709323bdd5407e53d5edbde02e77e664a5ee6cf4
This commit is contained in: