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

Change-Id: I6c54877a286dcc710a1339a5b350508df770c247