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

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

Change-Id: I6e35060e8e31d42ac34609ba699b2d9cb9a36237