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