Google and Disney are locked in a battle for the ages, but two of Disney's channels could return to YouTube TV soon.