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

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

Change-Id: I08c3ec8d2957e24508d19f0e1d5f57cb3a968d69