Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark"