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

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