Merge commit '3f52153a' into fix-merge-conflict

* commit '3f52153a':
  setup data on connectable apns on apn changed even there have already been some apns connected

To fix this conflict I removed the "if (isDisconnected" but left the
test for defaultSubId. This needs to be retested on Sprout with multiple
SIMs and HH with one SIM.

Conflicts:
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java

Bug: 17426028
Change-Id: I9bf2738b744cee819a3e551080e4098508e1e7fe