[automerger skipped] Merge "The stop string is...

[automerger skipped] Merge "The stop string is media_output_dialog_button_stop_casting" into tm-dev am: 100004b0 -s ours am: 3df0f734 -s ours

am skip reason: Merged-In Idd26d2b4e10dfcd00045184ddd2f9815a02ec7ce with SHA-1 6197f495 is already in history

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



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