am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair

Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c'

* commit 'd638a7cb0841184349edbec2c995a36e5719cb8c':
  b/2335545 Revert the dock strings back to "For Music and Media"