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

Change-Id: I71956dd999c8ec4be67bb6d58e1a1c3101e7c2b8