Revert "Fix NPE in ConnectivityService"

This reverts commit 235877d63b204f2e610d94097fc15005623c63b4.
Revert "Fix for the invalid Global Proxy Setting"

This reverts commit b213b5fcfa684b0625ebe4fe43f5e318c54a4e29.