Merge "Make MediaPlayer fail fast on UnknownServiceException."