Merge "Revert "Revert "Update the UIDs only after the native network is created""" am: c3f9e0e37c am: 507a30a591 am: 87b2f34d80 am: 357c434467

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

Change-Id: I2330f89b6ca92b2053b0b387ebfb879047776926