Merge "Make some SubscriptionManager APIs system APIs"