Merge "WifiManager: add updateInterfaceIpState" am: 2dbd137795 am: 6f69ea87e7
am: c58e6e4a7f

Change-Id: I9f9d579f782d3523dd71de9f49231ca6c8a305da