Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev
automerge: 32e17d4

* commit '32e17d400bd54f6ef5ea9e44c81cd51c5c41a427':
  Add CTS for MediaSession.Token