[automerger skipped] Merge "Handle ImsException in IMS callback APIs" am: d1a51b3dbe am: e17aa2a573
am: bda67733c1 -s ours
am skip reason: change_id I9bfe8de10a47be1625c8deb25fadcea4e7866aa8 with SHA1 ad4bb624f1 is in history

Change-Id: Ia3309ea3ffbf6d8e12d0c42822f1e477763edffc