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

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

Change-Id: I2435690399f54909dfa02b0ed9ad6c370dc880ae