Merge "ConnectivityServiceTest: some fixes in CallbackInfo"