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

Change-Id: I0558035b380d23c99a6af50c9cae916f6c0ad844