DirecTV and Disney Resolve Dispute, Restore Channels with Flexible Packages