Add the timeout duration to the watchdog message.

The timeout will varies depending on the handler checker and can also be
controlled by flags.

Test: Existing unit tests still pass.
Change-Id: I25dcbb58e087b4d5c2ff5e99d5da603d8b8e2b9e