[automerger skipped] Merge "Bug fix of 6GHz band channelization" into...

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

am skip reason: Change-Id I24c9c4d38c74681cd7318a9b052d9c2cd4ddf87f with SHA-1 b6d2fe75 is in history

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

Change-Id: I2ff32a86e55f4e443f7fd9274945eeff063ca3e8