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

Change-Id: I826ceab02a3ffd031b0f8ce8d367ffcde3e1e669