Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis." am: 1df4c1ae54 am: bdee77da38
am: 7d75eff739  -s ours

Change-Id: Iad2d9551806b564be0177e6beb5a3598334972f7