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

Change-Id: Iedca1a5c9892993e1ab8643311912ce9553138e5