Merge "Use user WFC setting instead of checking WFC service status"
am: 98c9c360fe

Change-Id: Ifadfa05025ba70480af6b03a2e497d282d955ebd