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

Change-Id: I4817cc7d85d7d93147118339969f8f271955bb10