Merge branch '334569-follow-up-pass-for-renaming-usage-ping-data-to-service-ping-data' into 'master'

Follow-up pass for renaming Usage Ping/Data to Service Ping/Data

See merge request gitlab-org/gitlab!66990