Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am: 1df4c1ae54
am: bdee77da38

Change-Id: Ie01e7db8f2c5eb4552db0ff7416998b67d70a501