Fix abstract MediaProvider playlist handling am: b653af292d
am: 835ff5e066

Change-Id: I2320b40da8c84ca7c4ff278c057653da10836dc8