Merge "Wi-Fi: Add support to scan and display 6GHz APs" into r-keystone-qcom-dev