I got my GSII from Amazon a couple of weeks ago. Was able to keep my unlimited plan, just had to contact AT&T before activating my new phone.
Also, this process was much quicker when dealing with AT&T through customer service chat online.
The people I spoke to on the phone over at AT&T said...