Merge "Update VpnTest to handle teardown-on-network-lost"