Merge "Migrate ConnectivityManagerTest to callback rule" into main