Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev