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

Change-Id: Iaa09160583d435a20684d84a03c21f4dc2548cfa