Merge "Add file access concessions for apps with MANAGE_EXTERNAL_STORAGE"