Merge "Stop silently dropping a NullPointerException" am: d99ca07884 am: 66c4dc0757 am: 55bc95f8d0

am: a6eed633f1

Change-Id: If8c5c45ed6a475b88871aa744069785283fabb47

telephony/java/android/telephony/TelephonyManager.java

@@ -8393,9 +8393,8 @@ public class TelephonyManager {
             ITelephony telephony = getITelephony();
             if (telephony != null)
                 retVal = telephony.isUserDataEnabled(subId);
-        } catch (RemoteException e) {
+        } catch (RemoteException | NullPointerException e) {
             Log.e(TAG, "Error calling ITelephony#isUserDataEnabled", e);
-        } catch (NullPointerException e) {
         }
         return retVal;
     }