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

[automerger skipped] Merge "The stop string is media_output_dialog_button_stop_casting" into tm-d1-dev am: 0a12f381 -s ours am: 8a44a262 -s ours am: 8f2b7d7b -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/+/18869512



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