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

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

Change-Id: I2a01a0c51c1d9374109c5e30f7409cf7606104e4