refactor: partial backport of #17963

[mergify]

This is an automatic backport of pull request #17963 done by Mergify.
Cherry-pick of 44934e3 has failed:

On branch mergify/bp/release/v0.50.x/pr-17963
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 44934e3b6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/e2e/bank/suite.go
	modified:   tests/e2e/distribution/cli_test.go
	modified:   x/bank/module.go
	modified:   x/distribution/autocli.go
	deleted:    x/distribution/client/cli/util_test.go
	new file:   x/distribution/keeper/grpc_query_test.go
	modified:   x/distribution/keeper/msg_server.go
	new file:   x/distribution/keeper/msg_server_test.go
	modified:   x/distribution/module.go
	modified:   x/staking/client/cli/tx_test.go
	modified:   x/staking/module.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by them: tests/e2e/distribution/suite.go
	both modified:   tests/e2e/distribution/withdraw_all_suite.go
	both modified:   x/bank/client/cli/tx.go
	both modified:   x/bank/client/cli/tx_test.go
	both modified:   x/distribution/client/cli/tx.go
	both modified:   x/distribution/client/cli/tx_test.go
	both modified:   x/distribution/keeper/keeper_test.go
	deleted by us:   x/protocolpool/autocli.go
	both modified:   x/staking/client/cli/tx.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[julienrbrt]

I will backport this at the end with the rest of autocli config.