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 am: b47dc7ca
Change-Id: I33cd4885b78a9f47f798c48522106c8bd5f3ebb9