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

Change-Id: I300760e6b3ba5dc3028ae2486d6e8777da64a1a1