Merge "WifiWatchdog: handle exception from ArpPeer"