Merge "Grant storage permission to default apps"