Merge "Properly catch ServiceSpecificException if IMS isn't available" am: ba0576ee28 am: a21832405f

Change-Id: I7b61a3780b81fcc112ed3599a486b64258f47ed1