Merge "Add file access concessions for SYSTEM_GALLERY"