Merge "cherry-picked "Add multiple esim support for SubscriptionManager""