Merge "wifi HAL uses "default" service name" am: 133aa77f8a am: 3b53cad88c
am: be34ad6cb6

Change-Id: I5e05a82866705a09340f0f0633eb5f34669848b9