Merge branch '492409-remove-double-locking-as-the-underlying-codebase-has-changed' into 'master'

Resolve "Remove double locking as the underlying codebase has changed"

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



Merged-by: Max Fan <mfan@gitlab.com>
Approved-by: Max Fan <mfan@gitlab.com>
Reviewed-by: Daniel P. <dprause@gitlab.com>
Reviewed-by: Max Fan <mfan@gitlab.com>
Reviewed-by: Panos Kanellidis <pkanellidis@gitlab.com>
Co-authored-by: Daniel Prause <dprause@gitlab.com>