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

Change-Id: I929859652a436c507c6c2af73afad3ea9292b981