There two completely separate processes to keep an eye...
The congressional bill, which will obviously have the force of law when passed.
The FAA rule-making process, which is more subject to debate, delays and outside influence.
A law, if passed, will overide any conflicting FAA provisions.