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

Change-Id: I49e919b9cf773cefa4ae20507b6227f651a653db