Merge "Allow sending of Administrator UIDs for *NETWORK_STACK" am: 0e75662808 am: e26f8d1bfe

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

Change-Id: I520b6c1bc6b8c1676c50a4d1bffb3df8cdfb18a2