Get ConnectivityServiceTest building again after 8f80cc8. am: 9d74d59302

Original change: undetermined

Change-Id: I65920de71e37cc37b2e5ac70f325d1ef7482c3c2