Merge "Associate MANAGE_EXTERNAL_STORAGE with external_storage gid"