Pick correct changes for MR splitting

ee/app/helpers/billing_plans_helper.rb

@@ -127,6 +127,10 @@ def billing_available_plans(plans_data, current_plan)
     end
   end
+  def show_start_free_trial_messages?(namespace)
+    !free_personal_namespace?(namespace) && namespace.eligible_for_trial?
+  end
+
   private
   def add_seats_url(group)

ee/app/views/shared/billings/_billing_plan_header.html.haml

 - parent_group = local_assigns[:parent_group]
 - namespace_for_user = namespace_for_user?(namespace)
+- show_start_free_trial_messages = show_start_free_trial_messages?(namespace)
 - if namespace_for_user
   = render_if_exists 'trials/banner', namespace: namespace
@@ -28,6 +29,6 @@
   - else
     = render 'shared/billings/trial_status', namespace: namespace
-  - if namespace.eligible_for_trial?
+  - if show_start_free_trial_messages
     - glm_content = namespace_for_user ? 'user-billing' : 'group-billing'
     %p= link_to 'Start your free trial', new_trial_registration_path(glm_source: 'gitlab.com', glm_content: glm_content), class: 'btn btn-confirm gl-button', data: { qa_selector: 'start_your_free_trial' }

ee/app/views/shared/billings/_trial_status.html.haml

 - faq_link          = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
 - pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing"
-- if namespace.eligible_for_trial?
+- show_start_free_trial_messages = show_start_free_trial_messages?(namespace)
+- if show_start_free_trial_messages
   = html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Ultimate.")) % { faq_link: faq_link.html_safe }
 - elsif namespace.trial_active?
   = html_escape(s_("BillingPlans|Your GitLab.com %{plan} trial will %{strong_open}expire after %{expiration_date}%{strong_close}. You can retain access to the %{plan} features by upgrading below.")) % { plan: namespace.gitlab_subscription&.plan_title, expiration_date: namespace.trial_ends_on, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }

ee/spec/features/billings/billing_plans_spec.rb

@@ -435,7 +435,7 @@ def external_upgrade_url(namespace, plan)
   end
   context 'with unexpected JSON' do
-    let(:plan) { bronze_plan }
+    let(:plan) { free_plan }
     let(:plans_data) do
       [