[automerger skipped] Merge "Remove the carrier config check when setting wfc" into qt-r1-dev am: 2237b09417 -s ours am: 92a03512fd -s ours
am: 01d8e67537 -s ours
am skip reason: change_id I3531e6aa6affc9249a42deb649d85f18b42c6f50 with SHA1 2190629040 is in history

Change-Id: I20fed1d5c6a5767b44070f70264809db25c7c2b1