Merge "Change getActiveSubscriptionInfoForIccIndex  to getActiveSubscriptionInfoForIcc" am: a0c6881ad7 am: 52cf699e6e

Change-Id: I7bfd37a1779138a48fe3c40f8f18dc01e019a918