Ride-hailing companies Uber and Lyft left the Texas capital to protest what they considered to be too-stringent rules. Now they’re back, but tension remains.