Merge branch '217858-improve-productivity-analytics-error-when-query-takes-too-long-to-calculate' into 'master'

Improve Productivity Analytics error message

Closes #217858

See merge request gitlab-org/gitlab!39074