Merge "Revert "Make SubscriptionManager.getSlotIndex public""