Merge "Expose UIDs for NetworkStack permission checks"