[automerger skipped] Merge "Bug fix of 6GHz band channelization" into rvc-qpr-dev am: 615277e961 am: 5ce694da9d -s ours

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

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

Change-Id: I2ff32a86e55f4e443f7fd9274945eeff063ca3e8
tree: 2a40ff896cee88ea6b7b97de08e12e2fd17abc73
  1. framework/
  2. OsuLogin/
  3. OWNERS