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: 0217b38b am: c43d97c9

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

Change-Id: I0b395be8d290c33202ac5887e9e526546d0ccdb6