Merge "MediaSession2Service: Initial commit"