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