Merge "hostapd: Get channel number from frequency based on other modes as well" into wlan-aosp-service.lnx.2.0-dev