Merge "Add new carrier config for supporting WPS over IMS" into qt-dev am: 0bf807f2f8
am: 6fcdd823d4

Change-Id: Ibdc377fdd5d1e3f17500470b49b6c327d3e534f0