Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev