Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" am: 6a2dab6878 am: 545283a8d2

Change-Id: I838e73a328a4965b4a0b2217d57274feb97961d9