Merge "In output switcher, the name of the device disappears for a brief...

Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a am: 170179bb am: 3ebaa8f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I2cf0ba6cd948e16e533fb884cc4225aaea579a7c