[clang] Allow SortIncludes to override DisableFormat when both are explicitly set to true (PR #208916)

[Joseph Tay via cfe-commits]

DynamicProdBreaker wrote:

> can we add a unit test?

Sure! I'm guessing I should add the test in the same place as the test that the other fix added? Might take me a while to figure out how to write the test though.😅

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