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

Change-Id: I55d0e265488a67d0c379f19e47fbadff5ba51671