[automerger skipped] Merge "Bug fix of 6GHz band channelization" into rvc-qpr-dev am: 89d7253825 am: b45a724868 -s ours

am skip reason: Change-Id I0a74591d9102f76b2c3ab13b181825314eb82b92 with SHA-1 a0cfc1491f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/12623589

Change-Id: Ifa4402845db1d1c4348cc91f4218099646df05b0