Merge branch 'master' into units-staging

Conflicts:
	icu4c/source/data/misc/supplementalData.txt

diff --cc icu4c/source/data/misc/supplementalData.txt
Simple merge

diff --cc icu4c/source/i18n/Makefile.in
Simple merge

diff --cc icu4c/source/test/intltest/numbertest_api.cpp
Simple merge

diff --cc icu4c/source/test/intltest/numfmtst.cpp
Simple merge

diff --cc tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
index 8f7cbfd620283e972109c74cedd6b8336bcc6cd3,db7d4d2268035b7f2bdbe5a6f072e34afd73b95d..3d50cbff176e4db7a5b0b5f01d669e6afd7dd299
--- 1/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
--- 2/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
+++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
@@@ -272,13 -267,14 +272,18 @@@ public final class LdmlConverter 
                  .filter(t -> t.getCldrType() == LDML)
                  .flatMap(t -> TYPE_TO_DIR.get(t).stream())
                  .collect(toImmutableList());
+         if (splitDirs.isEmpty()) {
+             return;
+         }
+ 
+         String cldrVersion = config.getCldrVersion();
  
 +        if (splitDirs.isEmpty()) {
 +            return;
 +        }
 +
          Map<IcuLocaleDir, DependencyGraph> graphMetadata = new HashMap<>();
-         splitDirs.forEach(d -> graphMetadata.put(d, new DependencyGraph()));
+         splitDirs.forEach(d -> graphMetadata.put(d, new DependencyGraph(cldrVersion)));
  
          SetMultimap<IcuLocaleDir, String> writtenLocaleIds = HashMultimap.create();
          Path baseDir = config.getOutputDir();