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

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

Change-Id: Ia3c9fc980298536e11bd676671c8d4ba25b126ec