Merge "wpa_supplicant HAL uses "default" service name" am: f9fc2f08e0 am: c9f8bd0712
am: 296d1b0f40

Change-Id: Ide771d4ef93596c90fda8cda5921ff828fa589e5