Speaker Mike Johnson scaled back the measure to two years from five, winning over hard-right Republicans who believe Donald J. Trump will be president by the time it would expire.