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

Change-Id: Ie3223fd22b37f12da2bc5b2bea539a28c9c74b77