Merge "VideoView2: Remove APIs supported by MediaSession"