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

Change-Id: Ic83751fc66248f0e9a49febdaa269424ef95613e