[automerger skipped] Bug fix of 6GHz band channelization am: ae9beaa5d3 -s ours

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

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

Change-Id: I4069fcd5a282d080294a5486ebf59cffc2eab37e