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

Change-Id: I280d17995b1ecca97b5fe2d79e3643968d7f4f30