Merge "Update VpnTest to use VpnNetworkAgentWrapper"