[automerger skipped] Merge "Remove the carrier config check when setting wfc" am: 8ae208f29f am: d9aa6452be am: 8706c94584
am: 11e84aa546 -s ours
am skip reason: change_id I3531e6aa6affc9249a42deb649d85f18b42c6f50 with SHA1 2190629040 is in history

Change-Id: I0583c45e69bfd2ddf2d2f00854b466ee92fed620