Merge "Adds ERROR state to ImsConfig" am: 6391598412 am: 7b01ee5cda
am: ec14bc71e2  -s ours

Change-Id: I254f6d797da1fed9585ae70612a5b4ad7d53223e