Fix abstract MediaProvider playlist handling am: b653af292d am: e78fd8b50f
am: 174987f31f

Change-Id: Ie464d6c24ef3af40e5c685b6211de2344008f363