Got off the phone with Olivia at ATT Customer Support and she confirmed that Unlimited Data Plans are no longer grandfathered when switching to a new phone.  I asked her again to repeat the confirmation to make sure I didn't mis-hear anything and she did confirm that ATT will no longer grandfather the plans.

Guys, take care of your phone so you don't have to switch and lose your plans.