Merge "[Output Switcher] Update device icon and Media metadata" into udc-dev am: 407b3920 am: e3ac13c0 am: 0780e1ae

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



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