Merge "Make ImsException final" am: cdc0da732d
am: ec6bf56d64

Change-Id: I21066c2da0f05fdb0fd7b34744d173ab9a63a43d