[DO NOT MERGE] WifiStateMachine: better handle disconnect
am: 225b5d3d3d

Change-Id: Ifbac43ea778512bb0fc85f174915bd149ccf313c