Merge "wpa_supplicant HAL uses "default" service name"
am: f9fc2f08e0

Change-Id: Ib23501258a9bb5ae325546e69898092b133ba747