Merge changes from topic "mediasession2_stack"

* changes:
  MediaSessionService: Keep Media1 and Media2 session in the one place
  Introduce common interfaces for both session1 and session2