Merge "MediaSession2: Implement setPlayer"