[clang-tools-extra] [clangd] Reduce superfluous rename conflicts (PR #121515)

[Chris B via cfe-commits]

https://github.com/llvm-beanz approved this pull request.

Looks reasonable to me, sorry for the review delay.

https://github.com/llvm/llvm-project/pull/121515