Merge "Merge "WifiManager: add updateInterfaceIpState" am: 2dbd1377 am: 6f69ea87" into nyc-mr2-dev-plus-aosp