Merge "wifi: add 60GHz Wi-Fi P2P support"