Merge "Merge "Treat playlists like first class media files" into rvc-dev am: d021b285 am: b58c1d71" into rvc-d1-dev-plus-aosp