Java: update genVsMan query test case; resolve conflict

Author: Jami Cogswell

java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApis/java/lang/UnsupportedOperationException.java

@@ -0,0 +1,9 @@
+// Manually created from java.lang.UnsupportedOperationException for testing purposes
+
+package java.lang;
+
+
+public class UnsupportedOperationException
+{
+    public UnsupportedOperationException(String p0){} // manual summary
+}

java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected

@@ -1,5 +1,5 @@
 | java.io | 0 | 0 | 22 | 9 | 31 | 0.7096774193548387 | 0.0 | 0.7096774193548387 | 0.0 | NaN | 0.2903225806451613 |
-| java.lang | 0 | 0 | 59 | 89 | 148 | 0.39864864864864863 | 0.0 | 0.39864864864864863 | 0.0 | NaN | 0.6013513513513513 |
+| java.lang | 0 | 0 | 60 | 89 | 149 | 0.40268456375838924 | 0.0 | 0.40268456375838924 | 0.0 | NaN | 0.5973154362416108 |
 | java.lang.invoke | 0 | 0 | 0 | 1 | 1 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.lang.reflect | 0 | 0 | 0 | 4 | 4 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |
 | java.math | 0 | 0 | 0 | 16 | 16 | 0.0 | 0.0 | 0.0 | NaN | NaN | 1.0 |