The Infuse has it on Froyo, so I'd be willing to bet that it's also there in the S2.
One caveat - on my Infuse's stock ROM it had a warning that using the Mobile AP required a tethering plan, so I'm also willing to bet that the S2 will have some way to track usage so AT&T can automatically add...