The deal ends a dispute that led to a two-week blackout of most live sports broadcasts on the streaming platform. ABC, FX and National Geographic will also return.