Merge "Stop silently dropping a NullPointerException"

am: d99ca07884

Change-Id: I11e76cf1174057e2178f52faeae8e225062d1488

telephony/java/android/telephony/TelephonyManager.java

@@ -8245,9 +8245,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;
     }