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

Change-Id: Ie2fe8bcc167e91b983bf6ec9548589b140f3976e