Merge "Save uid netd network permissions"