Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4 am: 4d8c041377

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

Change-Id: Ia2bea564fb2d86eb354c26dfb0e0b60adb9b6fc2