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

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

Change-Id: Icce5daeea377dbe63fd229a0dc18e60205e8a41b