Merge branch 'units-staging' of github.com:sffc/icu into units_router

diff --cc icu4c/source/test/intltest/unitstest.cpp
index e447e5cce8f577ac1fed7c762350eb6eb9d3c2c6,41d761132fa86ff53034066d48bfacb9ee58f904..901beae69bc93485e406df0b677d297b6eecf08c
--- 1/icu4c/source/test/intltest/unitstest.cpp
--- 2/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@@ -11,17 -13,10 +13,19 @@@
  #include "unicode/measunit.h"
  #include "unicode/unistr.h"
  #include "unicode/unum.h"
 +#include "unitconverter.h"
  #include "uparse.h"
 +#include <iostream>
 +
 +struct UnitConversionTestCase {
 +    const StringPiece source;
 +    const StringPiece target;
 +    const double inputValue;
 +    const double expectedValue;
 +};
  
+ using icu::number::impl::DecimalQuantity;
+ 
  class UnitsTest : public IntlTest {
    public:
      UnitsTest() {}