[automerger skipped] Add new carrier config for supporting WPS over IMS
am: a722fdf05a -s ours
am skip reason: change_id Idb698b12ba08086584e1883cc61e31f924ae42cb with SHA1 dcc0dd2efc is in history

Change-Id: I2d118c2b0032df8457c9d000091d6633b17318ef