[automerger skipped] Remove the carrier config check when setting wfc am: 1104f1bde3 -s ours
am: 799f8fc6b6 -s ours
am skip reason: change_id I3531e6aa6affc9249a42deb649d85f18b42c6f50 with SHA1 91040ecfaf is in history

Change-Id: I46f064969718c6bf548742ce7896214f840f057b