Merge "Remove the carrier config check when setting wfc" into qt-r1-dev
am: 2237b09417

Change-Id: Ia7577fb763595f5a45a231e6e2256f9c6c8ed87d