Speaker Mike Johnson scaled back the measure to two years from five after Donald J. Trump had urged Republicans to “kill” it. An effort to require warrants to search for Americans’ messages failed on a tie.