Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
am: 143575e128
am: ea0ff4fe06
Change-Id: Ide561c44f6490c5d76a330d86387a59e0021cdeb
This commit is contained in: