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

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

Change-Id: I2ea7232aab0c560a904dc5887684d5412f3bfc9b