Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5
am: 5f046cb614

Change-Id: I4bf83bb6b874a6ab82a6dd54228758d204120acc