Merge "Extract metadata info from MediaPlayer.Queue added by Google Play...
Merge "Extract metadata info from MediaPlayer.Queue added by Google Play Music" am: 5e95f126 -s ours am: 85634cdf -s ours
am: 1f6ba309 -s ours
Change-Id: Ice8509ffd60ca655d4a342a6cf0bb583e7278a75