Merge "Make ImsException final"
am: cdc0da732d

Change-Id: Ic2aafb555b69398852409fc80f6ace5f0f92d1dc