Merge "Make SubscriptionManager.isValidSubscriptionId public"