Merge "Notify WifiManager of interface state changes" am: 8e97274186
am: 241a7f15f2

Change-Id: I4360a558181624004a88074da92b3bbf202a6a18