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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12551035

Change-Id: If597837015595b755ed5f82530384425f3a57c98