Merge \"Merge \\"Stop listening for WiFi interface status changes\\" into...
Merge \"Merge \\"Stop listening for WiFi interface status changes\\" into nyc-mr1-dev am: 377a8dd1\" into nyc-mr1-dev-plus-aosp
am: c6b80c3b
Change-Id: I91eb857d68bc63566c619493eb1de974dd12abe8