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

Change-Id: Ibf030805054b2f162ab27d7282601ba706070ee0