Merge "Fix ConnectivityManagerTest initialization on Q"