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