This reverts commit b3f9f4a3. Reason for revert: Crash in WifiStateMachine (b/70394432) Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8