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: I1782670164bda78977b0356174b628d99247e765