Merge "Add multiple esim support for SubscriptionManager"