feat: add custom max gas for block for sim config (backport #16656)

[mergify]

This is an automatic backport of pull request #16656 done by Mergify.
Cherry-pick of 9b2fd7b has failed:

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

You are currently cherry-picking commit 9b2fd7bad.
  (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:   CHANGELOG.md
	modified:   types/simulation/config.go
	modified:   x/simulation/simulate.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/simulation/params.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

[mmsqe]

Suggested change

	<<<<<<< HEAD
	func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec) *abci.ConsensusParams {
	=======
	func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec, maxGas int64) *cmtproto.ConsensusParams {
	>>>>>>> 9b2fd7bad (feat: add custom max gas for block for sim config (#16656))
	func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec, maxGas int64) *abci.ConsensusParams {