Merge changes I91ad6127,I416bfd0e into nyc-dev

* changes:
  WifiLastResortWatchdog trigger logic
  WifiLastResortWatchdog failure counting
tree: 91744ffd2e863f97f4de7e06d61053e8f52a2548
  1. service/
  2. tests/