Diageo has announced a tie-up with the organiser of the Formula One motor racing season that will see its Johnnie Walker brand become the sport's "Official Whisky".