Merge "Revert "Revert "Update the UIDs only after the native network is created""" am: c3f9e0e37c am: 507a30a591 am: 87b2f34d80

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976728

Change-Id: Ia52245b97c41ce630e08af19e354482b2b82397b