Merge "Abstract set APIs in SubscriptionManager" am: 5165bbdeff
am: 67c542f374

Change-Id: I3fdc13753eacd6317cb25c5b3c40786453004f26