Merge "VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent"