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

Change-Id: I7fae0ed908cca7a4e23c37536f59b4c5df0be862