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

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

Change-Id: I8b87a12ea8023bdf6431adf6f478d046db76fc61