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

Change-Id: Ie49dbd2542bde07b8f71d9ea1f0ba088d523f6fe