Merge "cherry-picked "Add multiple esim support for SubscriptionManager""
am: 3c0efa4e0a

Change-Id: I0f9c1897aa079c9405f09ef9e09e2f08e4ef4a4a