Merge "MediaPlayer: handle concurrency on mTimeProvider"