Merge "Allow sending of Administrator UIDs for *NETWORK_STACK"