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

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

Change-Id: I5b05ea2b37ad09c6fbb01af366cfe2cd2f90c89d