Merge "Make SubscriptionManager.isActiveSubId public"