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

Change-Id: I4799ceb4b30ea24d682574714c6b3de396b88e3a