DS_r4: Don't use invalid phone IDs as index.

phoneId can be -1 via this path, triggered via SimBootReceiver:
java.lang.Throwable
     at com.android.internal.telephony.dataconnection.DctController$SwitchInfo.<init>(DctController.java:743)
     at com.android.internal.telephony.dataconnection.DctController.setDefaultDataSubId(DctController.java:781)
     at com.android.internal.telephony.SubscriptionController.setDefaultDataSubId(SubscriptionController.java:1443)
     at com.android.internal.telephony.SubscriptionController.clearDefaultsForInactiveSubIds(SubscriptionController.java:1533)
     at com.android.internal.telephony.ISub$Stub.onTransact(ISub.java:307)
     at android.os.Binder.execTransact(Binder.java:446

Change-Id: Idf050fe5fff9b24cdbf890d0abc12d52fba21b3f

SS_r4: Merge tag 'android-5.1.1_r2' into aosp-5.1

Android 5.1.1 release 2

pre-stable: Telephony: Add OperatorReplace api to framework:

this converts the operator number into carrier name, 2 API

this one load once if the number is the same through the life span of the SIM.
public static String operatorReplace(String response)

This one is for loop based sisuation, doesn't lazy load the selective-spn.xml,

public String unOptimizedOperatorReplace(String response)

Change-Id: I4273e6091df8c0e59ca86ac6d69bd8e40e9c4d44

alpha: Disable default APN context when release network request is received.

Currently, default apn context remains in enabled state even after
receiving release network request from Connectivity Service.
This causes mobile internet data to get re enabled when WIFI is connected.
Explicitly disable default apn context when release network request is
received.

Change-Id: I9d81072d196939b1085dbd9a1b984a06b95566bb
CRs-Fixed: 746834