Merge branch 'cherry-pick-07ed3df0' into '17-5-stable-ee'

[Backport] Fix indexing subgroup associations

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



Merged-by: Siddharth Dungarwal <sdungarwal@gitlab.com>
Approved-by: Siddharth Dungarwal <sdungarwal@gitlab.com>
Co-authored-by: Terri Chu <tchu@gitlab.com>