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

Change-Id: Iebe4441199fd847547dd51f0d11759c359ae0ab7