Merge "[API Review] APIs in SubscriptionManager" am: d4da70fe2f

Change-Id: I37a46e4086709ca5712615e070ae45687acfaa98