Merge "Catch runtime exception when telephony is not available" into main
diff --git a/service/java/com/android/ecm/EnhancedConfirmationService.java b/service/java/com/android/ecm/EnhancedConfirmationService.java
index af2e811..515f70a 100644
--- a/service/java/com/android/ecm/EnhancedConfirmationService.java
+++ b/service/java/com/android/ecm/EnhancedConfirmationService.java
@@ -162,7 +162,7 @@
             if (number != null && mTelephonyManager.isEmergencyNumber(number)) {
                 return CALL_TYPE_EMERGENCY;
             }
-        } catch (IllegalStateException | UnsupportedOperationException e) {
+        } catch (RuntimeException e) {
             // If either of these are thrown, the telephony service is not available on the current
             // device, either because the device lacks telephony calling, or the telephony service
             // is unavailable.