Merge changes from topic "am-7555b5787ba0475ead51afd7776f3a0c" into tm-qpr-dev-plus-aosp

* changes:
  [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
  [automerger skipped] The stop string is media_output_dialog_button_stop_casting am: e482415e -s ours am: 1eb41b8c -s ours