Merge "Merge \"Stop listening for WiFi interface status changes\" into nyc-mr1-dev am: 377a8dd1e4" into nyc-mr1-dev-plus-aosp