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

Change-Id: I0ae8f80c9a4019977e3a26d1f3ef4270a069137e