[automerger skipped] Merge "[Output Switcher] Upadte text string" into tm-dev...

[automerger skipped] Merge "[Output Switcher] Upadte text string" into tm-dev am: 5a3319de am: 27d9c472 -s ours

am skip reason: Merged-In Id3511f055f31532b85299dd6f398118d808cc0f0 with SHA-1 ee66a6d0 is already in history

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

Change-Id: I989b5fd0a12f9ab042a5e5023ba8ff83d2adcfc1