Merge "Fix MANAGE_EXTERNAL_STORAGE permission gid mapping" into sc-dev