Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"