Merge "Merge "[Output Switcher] Update device icon and Media metadata" into...

Merge "Merge "[Output Switcher] Update device icon and Media metadata" into udc-dev am: 407b3920 am: ba927cb4" into udc-d1-dev-plus-aosp am: acc38a29

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



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