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

[Ujan RoyBandyopadhyay via cfe-commits]

ujan-r wrote:

No worries, thanks for the review! I don't have commit access, so you'll have to merge the changes on my behalf.

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