Merge "Unable to show correct device icon in Output Switcher" into rvc-dev am: fb87c72c66 am: 54091ba0f1 am: 864e606c40 am: 13f4f8ecaf

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

Change-Id: I2d0d9cf1a97598c8f0aa65c1dd7937963bf6f02d