am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev

* commit '25afa649171bb3821df4029d893356393b7d8b57':
  Add CTS for MediaController.Callback