merge sffc/units-staging

diff --cc icu4c/source/test/depstest/dependencies.txt
Simple merge

diff --cc icu4c/source/test/intltest/unitstest.cpp
index acdb5c3f0dcb148765cc8c1524964c4c7248346f,2bca6d64bebe636dea4d392a4830c5409af74adf..387d4565c4ff6a711c3b75fea952186f87b2250f
--- 1/icu4c/source/test/intltest/unitstest.cpp
--- 2/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@@ -615,4 -537,4 +615,4 @@@ void UnitsTest::testPreferences() 
      }
  }
  
--#endif /* #if !UCONFIG_NO_FORMATTING */
++#endif /* #if !UCONFIG_NO_FORMATTING */