Merge "Wifi: Use WifiAwareChannelInfo instead of HAL structure"