Merge "[Output Switcher] Update stop button text" into tm-qpr-dev am: 0aadb77a

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



Change-Id: I9381adf75db05dcb29667611faded8ef0bb4f1e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>