[automerger skipped] Merge "Change getActiveSubscriptionInfoForIccIndex  to getActiveSubscriptionInfoForIcc" am: a0c6881ad7 am: 52cf699e6e am: 913abd40c7 -s ours
am skip reason: Change-Id Ibea20a40ae3183f7aa6ca0ffd2b8d20d332d0aa0 with SHA-1 dfc8588930 is in history

Change-Id: Ic9bf340c4494c0e18600108930435d66b9830e3d