Merge "[Output Switcher] Update device icon for dock device" into udc-dev am: ac99ff85

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



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