Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPT...

am: 080e16575a

Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc telephony/java/com/android/internal/telephony/TelephonyIntents.java
index cf8d690,1f32766..32d3f27
--- 1/telephony/java/com/android/internal/telephony/TelephonyIntents.java
--- 2/telephony/java/com/android/internal/telephony/TelephonyIntents.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
@@@ -15,9 -15,9 +15,10 @@@
   */
  
  package com.android.internal.telephony;
 +import android.content.Intent;
  
  import android.content.Intent;
+ import android.telephony.SubscriptionManager;
  
  /**
   * The intents that the telephony services broadcast.