Merge "Treat playlists like first class media files" into rvc-dev am: d021b285 am: b58c1d71 am: 9af16dbe Change-Id: Ic242d94f11ff444775559957cf5a48887c377228