[automerger skipped] Merge "Migrate WifiStateMachine to IIpClient" am: 5e0dec49c7 am: 3ae258ffaa
am: 2c5beea6d1 -s ours
am skip reason: change_id I738d839a1be56004b1f881bb814646cfe9bdb48a with SHA1 18932373d8 is in history

Change-Id: I542a325667c5650a97c92677847984ee85ed4123