SOCHI, Russia—U.S. Speedskating and Under Armour Inc. renewed a partnership through the 2022 Olympic Games on the heels of a public flap over the sportswear maker's skinsuits that divided the team and underpinned its disastrous performance here.