Yes
If all you did was activate and jailbreak, it should be back to the original settings, and not activated. iTunes will ask you to activate and treat it either like a sync'ed phone or a new phone.
If you unlock the phone, then restore, it will do the same. But if you use iNdependence to activate, you will have an unlocked phone in the original state, and the only way the Apple Store will know is if they put another SIM in it.
In my experiemce at least.
But no one knows if the new update will brick it or not.