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

Change-Id: I27253016da23f7973587f9dd71ab76b13048538a