Merge "Use label instead of cast icon in output switcher" into sc-qpr1-dev am: 19a2adb33b

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

Change-Id: Iab4748d196e1b65267e3618a134992c008b46fb7