Merge "MediaPlayerService: Clear the vector holding tracks" am: b6229652ed
am: efb1eecb65

Change-Id: I44224de4c99a62f413b8cc9f448231c89e983ef3