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

Change-Id: I006528d4295339a1d06a2f93f3000fbe1b279e73