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

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

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

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

Change-Id: I5692ec5e0c04ff0ca9a909ab27739c3ad6e7b82e