Merge changes from topic "session2Token"

* changes:
  Revert "Remove MediaController2 usages in MediaSessionServiceImpl"
  Revert "Ensure that framework does not refer MediaSession2 related code"