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

Change-Id: I1f6212b6ed829971c1de42b9d2bdad9ed7bc539a