Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: ecfdf63e6f am: 96388dd7a3
am: 1f59adaf11  -s ours

Change-Id: I587022940952b602a864534666536d700c608cf0