Merge "Merge "Treat playlists like first class media files" into rvc-dev am:...
Merge "Merge "Treat playlists like first class media files" into rvc-dev am: d021b285 am: b58c1d71" into rvc-d1-dev-plus-aosp am: 0b2a3a1e
Change-Id: Ie95523440247d32a2b2547392825fea4899e203f