Merge "MediaPlayer: fix use after free for mMediaTimeProvider"