Stop silently dropping a NullPointerException

In TelephonyManager, if we get a NullPointerException, don't just
silently drop it.

Bug: 130287372
Test: manual
Change-Id: Ic85512577f67edd25b0fa808ff3280201c851383

telephony/java/android/telephony/TelephonyManager.java

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