Fix and simplify ConnectivityService singleton.

Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d
1 file changed