Merge "wpa_supplicant HAL uses "default" service name"