Merge "Do not rely on roaming when setting WFC roaming setting"
am: f5b60b967c

Change-Id: I5bd1c1911524cfaae093849b2f30fea8306e925a