Merge "VideoView2: remove hidden api usage, setMetadataFilter and getMetadata"