Merge branch '428043-billable-users-cr' into 'master'

Increse billable users when using custom roles

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



Merged-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Approved-by: mo khan <mo@mokhan.ca>
Approved-by: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Reviewed-by: Jarka Košanová <jarka@gitlab.com>
Reviewed-by: Eduardo Sanz García <esanz-garcia@gitlab.com>
Reviewed-by: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Reviewed-by: mo khan <mo@mokhan.ca>
Co-authored-by: Jarka Košanová <jarka@gitlab.com>