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

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

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

Change-Id: Icd2c719da37988f9599c82d7ea733ab8973fe81e