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

* commit '132617de897a1de256114c1a6cc3680983d37e84':
  Make MediaPlayer fail fast on UnknownServiceException.