I don’t think that this would be likely to pass Congress. Even if it were, if Comcast failed to uphold its obligations due to receiving a National Security Letter (NSL) then they would be hamstrung, unable to comply and unable to protest publically.
It’s almost a legal impossibility and would be a bad move geopolitically to give up this full take capability and it is not happening. It’s wishful thinking to believe otherwise.