Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev