Merge "Revert "Update the UIDs only after the native network is created"" am: 4acd66156a am: 2e71cf0810

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

Change-Id: I1194302aae020d29f7232050082c6fca785955f1