Merge "Wifi: cts test failure testGetAllowedChannels" into sc-dev