Merge "Extract metadata info from MediaPlayer.Queue added by Google Play...
Merge "Extract metadata info from MediaPlayer.Queue added by Google Play Music" am: 637be13d -s ours am: 7202d65a -s ours
am: 0aa42acf -s ours
Change-Id: Ice8509ffd60ca655d4a342a6cf0bb583e7278a75