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

[Joseph Tay via cfe-commits]

================
@@ -1355,6 +1355,8 @@ template <> struct MappingTraits<FormatStyle> {
     IO.mapOptional("Cpp11BracedListStyle", Style.Cpp11BracedListStyle);
     IO.mapOptional("DerivePointerAlignment", Style.DerivePointerAlignment);
     IO.mapOptional("DisableFormat", Style.DisableFormat);
+    if (Style.DisableFormat)
----------------
DynamicProdBreaker wrote:

I did consider that, but reading up on previous discussions it seems like people weren't very fond of that option. I can do that if consensus has changed though.

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