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

Change-Id: Iaacdd593c26e5e01c4b7c70147143ae2c0d60a28