Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
am: ed6e29f292

Change-Id: Id412c0be939da6240a66a942730fd18badabb6c6