Merge "Add getSubscriptionId API"

src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java

@@ -57,10 +57,6 @@ public class DisableSmartForwardingTask implements Runnable {
     }
 
     private int getSubId(int slotIndex) {
-        int[] subId = SubscriptionManager.getSubId(slotIndex);
+        return SubscriptionManager.getSubscriptionId(slotIndex);
-        if (subId != null && subId.length > 0) {
-            return subId[0];
-        }
-        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
 }