Merge "Add drm and kernel permissions to mediaprovider"