am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev

* commit '6585d2a763342db3c7577736b07805f8ccd6235d':
  Add CTS for MediaBrowser.MediaItem