[automerger skipped] Merge "Abstract set APIs in SubscriptionManager" am: 5165bbdeff am: 67c542f374
am: 8142499cdb  -s ours

Change-Id: Ib8f0f1b80ececb63903ce0c339e023ff46a280b6