Merge "Make SubscriptionManager.getSubId public"