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

Change-Id: Ib7d3dd0f7ce06edf736c493cde6778365c366ae2