Merge "Unable to show correct device icon in Output Switcher" into rvc-dev am: fb87c72c am: 422e5a60

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

Change-Id: Ia9d18f16a57a94aa69a53fceb2bfd3f47b276342