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

Change-Id: Ia0146a2308cbad24e70294b9a5357d411a787493