am baa00cc3: Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

* commit 'baa00cc350572c34718d770a31ebe2f76ffc9607':
  Revert "Refactor IpConfiguration from WifiConfiguration"