Merge "Remove the carrier config check when setting wfc" am: 8ae208f29f
am: d9aa6452be

Change-Id: I010e574f47094dcbcc7199f38a1b0afbf37a2f87