Merge "Extract test utilities for ConnectivityService" am: ecaff61c4b am: 9e23af5f90
am: 6d34ffb4e6

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094