Merge "Add shuffle to Music app" am: 551d7c0529
am: 2f8ac593ba

Change-Id: Iab4e650022dec37cca58dc8d52a4c508d0fdd960