Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: 4c13a10afc

Change-Id: Ia9947edff88dd74478c6705036c62e32f8ae5902