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

Change-Id: Idfe601cc3688bc28854637a10f613fb891b4faf2