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

Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp

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