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

* commit '46976b72aae160871ed2485a132a564aef5d37a5':
  Add CTS for MediaSession.Token