Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1
am: f54df6ccfb
am: 5642aa4ae8
-s ours
Change-Id: Ida22695c5e2d9e7db21a71821d6b7efb4ceeb4e3
This commit is contained in: