WifiWatchdogService refactor

Minor refactoring of WatchdogService ahead of logic changes.
Lightly tested on a stingray.

Change-Id: I051603a598fe3162f170fb0a09e461fcb9b0038e
2 files changed