Merge "Add content provider permission check"