x/gov: fix NormalizeProposalType() return values (bp #8808)

[mergify]

This is an automatic backport of pull request #8808 done by Mergify.

Cherry-pick of be23295 has failed:

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

You are currently cherry-picking commit be23295bd.
  (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:   x/gov/client/cli/cli_test.go
	modified:   x/gov/client/rest/rest_test.go
	modified:   x/gov/client/utils/utils.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x/gov/client/rest/grpc_query_test.go
	deleted by us:   x/gov/client/utils/utils_test.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

Closes: #8806

[codecov]

Codecov Report

Merging #8816 (8dd89e2) into release/v0.42.x (a8ace5a) will increase coverage by 0.09%.
The diff coverage is 75.00%.

@@                 Coverage Diff                 @@
##           release/v0.42.x    #8816      +/-   ##
===================================================
+ Coverage            61.97%   62.06%   +0.09%     
===================================================
  Files                  612      612              
  Lines                35431    35431              
===================================================
+ Hits                 21960    21992      +32     
+ Misses               11149    11113      -36     
- Partials              2322     2326       +4     

Impacted Files	Coverage Δ
x/gov/client/utils/utils.go	33.33% <75.00%> (+33.33%)	⬆️
x/gov/client/cli/query.go	70.30% <0.00%> (+1.16%)	⬆️
x/gov/client/rest/query.go	26.13% <0.00%> (+6.81%)	⬆️