Merge "Unable to show correct device icon in Output Switcher" into rvc-dev am: fb87c72c66 am: 422e5a6032 am: 21cc8afc92 am: d0f8715672

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

Change-Id: I81db553d94dc188baf060d9f0c783820cbf53a14