I very much think this was planned. In section 115a of the bill it gave the executive branch the ability to provide written notice and they could pause any part of the bill essentially.

So basically they got votes from Democrats to support the passing of the bill of increasing sanctions on groups by putting Russia in there, and then included a clause for Trump to pull the rug out from under the Russian portion, and added a reminder to his calendar to submit said prefilled out executive order right before it would go into effect on Russia.

(Obviously just my opinion on what happened)