[automerger skipped] Merge "Add new ImsException to better handle ImsService errors" am: 3811aba3a4 am: 0bfbfe5646
am: 8bb813dcd7 -s ours
am skip reason: change_id Ie3221d56a235c0e037d71e197f4972df31faa09b with SHA1 b2c88d1480 is in history

Change-Id: I5d6ba20c74bd1a2069c1b5ec65750830dc9ae42e