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

Change-Id: I47c692c483f040d997bf1ce37d42df62b31932e2