Merge "Unable to show correct device icon in Output Switcher" into rvc-dev am: fb87c72c66 am: 54091ba0f1 am: 473f6987de am: a6d3b0454b

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

Change-Id: Id9d4ff6e59aa1ed5f86f5f301563dc594eb0e6dd