Merge "Add new ImsException to better handle ImsService errors" am: 3811aba3a4
am: 0bfbfe5646

Change-Id: Ic3a0806cc5e1d6efb0c2d175fda77cd57466072a