Merge "Move VpnTransportInfoTest to common test"