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

Change-Id: Id17f0c6a29bd9731ee4aed4d219a8dc1af6c8b0c