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: Iffbf023199557e7c5260eb56ae750a76119e6b8f