Merge "Expose SubscriptionManager.getActiveDataSubscriptionId() as public API"