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

Change-Id: I01ef6a106b53f5f2b70d34f23fe820974e780d63