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

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

Change-Id: Id3b84267c613580645dc7786379050c466178fa8