Merge "Remove airplane mode related wifi test for Wi-Fi only devices." into ics-aah