Merge "Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4 am: 09a6961f20" into rvc-d1-dev-plus-aosp