Merge "wpa_supplicant HAL uses "default" service name" am: fa3cb1766e
am: a318f66144

Change-Id: I03bee4e0ffb183b1601f6811e74071a5c7009a7a