Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline"