[release-4.18] OCPBUGS-56898: Fix Cinder, Manila driver metrics#501

openshift-cherrypick-robot wants to merge 2 commits intoopenshift:release-4.18openshift/csi-operator:release-4.18from

openshift-cherrypick-robot:cherry-pick-386-to-release-4.18openshift-cherrypick-robot/csi-operator:cherry-pick-386-to-release-4.18Copy head branch name to clipboard