Merge "Treat playlists like first class media files" into rvc-dev am: d021b2851a am: b58c1d714a am: 9af16dbee0 am: 318a775020 am: df5f444300

Change-Id: I19eb748e885387519514f27857d13e2a7ba98a3a