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

Change-Id: I32c51e6db9af05eaf0a3165919ebbac2d74fb2b4