Merge "Disable open network notifier when DISALLOW_ADD_WIFI_CONFIG is set" into tm-dev