Merge "Return 0 instead of throwing RuntimeException from getSmsCapacityOnIcc" am: 258ecb55a5 am: e8ed5b17cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643623

Change-Id: Ic7929c8345ac56031c9e64c1d2df7ce7aa27825f

telephony/java/android/telephony/SmsManager.java

@@ -2127,7 +2127,7 @@ public final class SmsManager {
                 ret = iccISms.getSmsCapacityOnIccForSubscriber(getSubscriptionId());
             }
         } catch (RemoteException ex) {
-            throw new RuntimeException(ex);
+            Log.e(TAG, "getSmsCapacityOnIcc() RemoteException", ex);
         }
         return ret;
     }