Merge "MediaPlayer: use local variable to check whether mTimeProvider is null."