Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev
automerge: 6d4a6d3

* commit '6d4a6d3e6c84da6d05ac55aa3dbe65ab02bdb7ee':
  Add more CTS codes for MediaBrowserTest