am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."

* commit '7b55b8f0563d540804b14c1643b0adfea19a71b1':
  Make MediaPlayer fail fast on UnknownServiceException.