Merge "Add CTS for MediaBrowser" into lollipop-cts-dev
automerge: 71a8a6d

* commit '71a8a6d73a8132d33fab9824a3c7bae954ede4ec':
  Add CTS for MediaBrowser