Get ConnectivityServiceTest building again after 307dd58. am: e54dc09048

Original change: undetermined

Change-Id: I0fe223e94b185358895c0dd9295edaf41170866e