[automerger skipped] Merge "Properly catch ServiceSpecificException if IMS isn't available" am: ba0576ee28 am: a21832405f am: 225b5fc847 -s ours
am skip reason: Change-Id I4033659acb0031e2383ebcff55c1bb0798041abd with SHA-1 fee1f36a08 is in history

Change-Id: Ic16224e7cfe547b414cc2621379a5e0e3f60b699