[automerger skipped] Add new carrier config for supporting WPS over IMS am: a722fdf05a -s ours am: 50ca348528 -s ours am: 26335bcc0e -s ours am: 31df5763c1 -s ours
am: 357bb01d90 -s ours
am skip reason: change_id Idb698b12ba08086584e1883cc61e31f924ae42cb with SHA1 dcc0dd2efc is in history

Change-Id: Ibab5ceb5344b7c70ff6eff4a3ae313de78f76890