Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev am: f96266ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23358305



Change-Id: Ie026c9195c518e13caa9f982f5ce05b5d2212e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>