Merge "Stop using VPNs in getActiveNetworkForUidInternal."