Merge "Make SubscriptionManager.getSlotIndex public"
am: 719310cd2c

Change-Id: Ia942ecfefef8f26ff0b1f140c0692c81aebd11fa