Merge "Change getActiveSubscriptionInfoForIccIndex  to getActiveSubscriptionInfoForIcc"
am: a0c6881ad7

Change-Id: I54cdd557a813b040c6db341bb8a8290c75526484