Merge branch '421920-allow-merge-of-non-parseable-policy' into 'master'

Fix bug to allow merge of  non-parseable policies

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135433



Merged-by: Artur Fedorov <afedorov@gitlab.com>
Approved-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>