Merge "Allow sending of Administrator UIDs for *NETWORK_STACK" am: 0e75662808 am: 3a4638ff09 am: e9cd2f457f

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

Change-Id: I537dcddd3e94520f46be7edc44a3c3699ad8ec8b