Merge "Bug fix of 6GHz band channelization" into rvc-qpr-dev am: 89d7253825

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

Change-Id: I80d27cbcca94ad77f429759d8ad45659b7fa9c98