am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev

* commit '2ce3362385589df472aa8e221d01ca7d8118508d':
  Remove STOPSHIP in WifiWatchdogStateMachine