Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614 am: 7bbdfcd8eb
am: 913d39aafe

Change-Id: I78cfc9306ae8c240f10e991a5de51d09237257af