Merge "@RestoreDefaultNetwork in ConnectivityManagerTest" into main