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

diff --cc icu4c/source/test/intltest/unitstest.cpp
index def8966f903f50fceeab98fb9d02acf96ade7b25,41d761132fa86ff53034066d48bfacb9ee58f904..128bb172c0f340ddcc24a756fe215b4927f67b80
--- 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() {}