Merge branch '336975-users-setup-for-company-field-is-overridden-to-true-for-existing-users-during-subscription' into 'master'

Resolve "Users "Setup for company" field is overridden to true for existing users during subscription purchase"

See merge request gitlab-org/gitlab!68868