Merge "Expose getActiveSubscriptionInfoForIcc for Mainline"
am: 6a2dab6878

Change-Id: Id53db8ba6de678710e75c3435ff8ef312731410e