Merge "ConnectivityServiceTest: fix flakyness"