Merge "No-op cleanup of ConnectivityService."
am: a190a41b51

Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805