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
Change-Id: Id2964405d012887b35ad7675d4169bd2b70c54e5