Use user WFC setting instead of checking WFC service status
am: 4f72d25e99  -s ours

Change-Id: I1d4a7316eee6e28b4e4a611e6dbb3efe0ee5a597