Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev

automerge: fc921d1

* commit 'fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c':
  Sprint: MMS cannot be sent in the UK

telephony/java/android/telephony/TelephonyManager.java

@@ -703,7 +703,11 @@ public class TelephonyManager {
     public String getNai(int slotId) {
         int[] subId = SubscriptionManager.getSubId(slotId);
         try {
-            return getSubscriberInfo().getNaiForSubscriber(subId[0]);
+            String nai = getSubscriberInfo().getNaiForSubscriber(subId[0]);
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Rlog.v(TAG, "Nai = " + nai);
+            }
+            return nai;
         } catch (RemoteException ex) {
             return null;
         } catch (NullPointerException ex) {