Merge pull request #15246 from owen-mc/java/manual-neutral-overrides-generated

C#/Java: Manual neutral summaries should block generated summaries

java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll

@@ -528,6 +528,10 @@ private class SummarizedCallableAdapter extends SummarizedCallable {
     exists(Provenance provenance |
       summaryElement(this, input, output, kind, provenance) and
       provenance.isGenerated()
+    ) and
+    not exists(Provenance provenance |
+      neutralElement(this, "summary", provenance) and
+      provenance.isManual()
     )
   }