Merge "Import CallbackEntries in ConnectivityServiceTest"