Merge "Add more CTS for MediaController" into lollipop-cts-dev
automerge: ccde590

* commit 'ccde590a05032512d791a30989f7b946c3c2d22c':
  Add more CTS for MediaController