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

Change-Id: I69292cc56c838050cd687b5c86898b6591fedd0b