Merge "Extract test utilities for ConnectivityService" am: b7d270a73e am: 62857556a4
am: 6d34ffb4e6

Change-Id: Ib760ef922a440d54bab8c1647d8444ab2a717094