Merge changes from topic "am-af97a10ee6774c39ba2a556a829d4206" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "The stop string is media_output_dialog_button_stop_casting" into tm-dev am: 100004b0 -s ours am: af362f7e -s ours
  [automerger skipped] The stop string is media_output_dialog_button_stop_casting am: 04266254 -s ours am: 822ae072 -s ours