Merge "Sync the wfc roaming logic with Settings"
am: ec1faca4e3

Change-Id: I93de162018fca5b99470c220572ebeef83fd0eda