Merge "Handle ImsException in IMS callback APIs"
am: d1a51b3dbe

Change-Id: Ica7f3d8161cc1c5f96bdaa1b83da7b27377ae0a9