Merge "Make PrivateAddressCoordinator ignore vpn network"