A proposed city ordinance to raise rideshare pay has been dropped, but that decision cleared the way for a bigger deal. Now, Uber says it's on board.