am 1dfd0efa: am 52f70b2e: Fix bug with other apps launching the music app to play a song.

Merge commit '1dfd0efabffc1a5994c61939c3acff943156cb46'

* commit '1dfd0efabffc1a5994c61939c3acff943156cb46':
  Fix bug with other apps launching the music app to play a song.