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

Change-Id: I07f11e6cfbd34a598a61c9d931000c5f4fea1499