Merge "Restore ConnectivityManagerTest into presubmits" into main