Merge "Unable to show correct device icon in Output Switcher" into rvc-dev am: fb87c72c am: 54091ba0 am: 864e606c

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

Change-Id: I31b398422351f37dbc17557813f62b72d03a8bea