Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" am: 120a0a7281

Original change: undetermined

Change-Id: Id6ff0ca698d44f4664b654cec37c70fbd4dd8ad0