Merge "Migrate WifiStateMachine to IIpClient"
am: 5e0dec49c7

Change-Id: I9783880fe41e6b5fa3f3e0d44a9081a43b5f6df8