Merge "[Mainline] Use public method in SubscriptionManager for mainline"