[auto-merge] branch-25.02 to branch-25.04 [skip ci] [bot]

[nvauto]

auto-merge triggered by github actions on branch-25.02 to create a PR keeping branch-25.04 up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.

[nvauto]

FAILURE - Unable to auto-merge. Manual operation is required.

{'message': 'Base branch was modified. Review and try the merge again.', 'documentation_url': 'https://docs.github.com/rest/pulls/pulls#merge-a-pull-request', 'status': '405'}

Please use the following steps to fix the merge conflicts manually:

# Assume upstream is NVIDIA/spark-rapids remote
git fetch upstream branch-25.02 branch-25.04
git checkout -b fix-auto-merge-conflict-839 upstream/branch-25.04
git merge upstream/branch-25.02
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-25.02 into branch-25.04"
git push <personal fork> fix-auto-merge-conflict-839
# Open a PR targets NVIDIA/spark-rapids branch-25.04

IMPORTANT: Before merging this PR, be sure to change the merging strategy to Create a merge commit (repo admin only).

Once this PR is merged, the auto-merge PR should automatically be closed since it contains the same commit hashes