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

Change-Id: Ia9c1a41aae484dbf299c30324c4ec5deb03c0233