Merge changes from topic "am-72dc72fe3d2049a29c5e2c45ca7a90dd" 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: 3df0f734 -s ours
  [automerger skipped] The stop string is media_output_dialog_button_stop_casting am: 04266254 -s ours am: 294ae6f3 -s ours