Merge "Migrate WifiStateMachine to IIpClient"
am: 61ce2d63b3

Change-Id: I9783880fe41e6b5fa3f3e0d44a9081a43b5f6df8
tree: 9c23dbcacafa513e1d32ebd5f1e08edb10f86064
  1. service/
  2. PREUPLOAD.cfg