Merge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26 am: 8e27bc49d4 am: aedb232cb8
am: aba3b5770a

Change-Id: Ia2732340d4825b52a1e4c2184d51f83a9688574c