Merge "Merge "WifiManager: add updateInterfaceIpState" am: 2dbd1377 am: 6f69ea87" into nyc-mr2-dev-plus-aosp am: 2270951b Change-Id: Iabd864759181aba72766a26110ecef9f4cca3d5d