Fix abstract MediaProvider playlist handling am: b653af292d
am: e78fd8b50f

Change-Id: I436f6b590b96a686e2fcfb038bc54939e85cefa9