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

Change-Id: Idfea637a9fd071c8fa62798bf8e3b9f241bc6348