Merge "Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086 am:...

Merge "Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086 am: 09a6961f" into rvc-d1-dev-plus-aosp am: c18a49b3 am: b688f8eb

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

Change-Id: I3adab0c6eefd7da2e7225e634d6fe7c5128d440d