[automerger skipped] The stop string is...

[automerger skipped] The stop string is media_output_dialog_button_stop_casting am: e482415e -s ours am: 1eb41b8c -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: I512927323266d4e3b811bffd51a0e0c48bbd4bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>