Merge "Remove GALLERY_PROVIDER permission usage"