Merge "Include phoneId as extra when subId is not available."

telephony/java/android/telephony/SubscriptionManager.java

@@ -2048,6 +2048,8 @@ public class SubscriptionManager {
             putPhoneIdAndSubIdExtra(intent, phoneId, subIds[0]);
         } else {
             logd("putPhoneIdAndSubIdExtra: no valid subs");
+            intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
+            intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);
         }
     }