Merge "Revert "connectivity_native_test: remove retries""