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