resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev

Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317

diff --cc api/current.txt
index 113405f,299a33c..6860fb0
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -28378,9 -28368,6 +28372,8 @@@ package android.telephony 
      method public void downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
      method public android.os.Bundle getCarrierConfigValues();
      method public static android.telephony.SmsManager getDefault();
-     method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent);
 +    method public static android.telephony.SmsManager getSmsManagerForSubscriber(long);
 +    method public long getSubId();
      method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
      method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);
      method public void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);