Cleanup ZHA metering and electrical measurement channels#33992

Adminiuga merged 2 commits intohome-assistant:devhome-assistant/core:devfrom

dmulcahey:dm/zha-smartenergy-metering-cleanupdmulcahey/home-assistant:dm/zha-smartenergy-metering-cleanupCopy head branch name to clipboard