Merge "Adds ERROR state to ImsConfig" am: 6391598412
am: 7b01ee5cda

Change-Id: Ibe07686d7e24c86d4011fc4ef8a137c887ba1362