Merge "Revert "Add + enforce new DeviceConfig permissions.""