[llvm-branch-commits] [clang] release/23.x: [clang-format] Harden star and amp annotation (#212856) (PR #216554)

[via llvm-branch-commits]

owenca wrote:

> @owenca I've updated the commit with the additional cherry-pick and squashed the commits together, can you give it a quick look when you have a chance to make sure I did not mess anything up?

LGTM

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