Merge "Revert "Revert "Wifi: Support check on device capability for 6GHZ"""