Merge "wpa_supplicant HAL uses "default" service name" am: fa3cb1766e am: a318f66144 am: 3874fba6f7
am: 9f356278ae

Change-Id: Iad19132f3d89a9b0122e5eaba393a8f8de055892