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

Change-Id: I49bb649662a2f768b7099768e304a1a0a37f3cfe