Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId"