DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
am: cbf8ff83a8  -s ours

Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099