Merge "Extract metadata info from MediaPlayer.Queue added by Google Play...
Merge "Extract metadata info from MediaPlayer.Queue added by Google Play Music" into oc-dr1-dev am: a2fe58b5
am: 9e2ad749
Change-Id: I7c0622da057fd82b19b31c99d63384c7fc82ac8e