ICU-13513 Merging trunk to branch

X-SVN-Rev: 40819

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/impl/number/DecimalQuantity_SimpleStorage.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
index d0a5879a319e55d8d0cf040b501582228df23f84,e801f564e62b1ef343fcd4444e31e14d4fd3da34..fd7e0ebf4184c657dc251d209caafa4cfd879993
--- 1/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
--- 2/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
@@@ -9,12 -10,13 +9,13 @@@ import java.text.ParsePosition
  import org.junit.Test;
  
  import com.ibm.icu.dev.test.TestUtil;
+ import com.ibm.icu.dev.text.DecimalFormat_ICU58;
  import com.ibm.icu.impl.number.DecimalFormatProperties;
  import com.ibm.icu.impl.number.Padder.PadPosition;
 -import com.ibm.icu.impl.number.Parse;
 -import com.ibm.icu.impl.number.Parse.ParseMode;
  import com.ibm.icu.impl.number.PatternStringParser;
  import com.ibm.icu.impl.number.PatternStringUtils;
 +import com.ibm.icu.impl.number.parse.NumberParserImpl;
 +import com.ibm.icu.impl.number.parse.NumberParserImpl.ParseMode;
  import com.ibm.icu.number.LocalizedNumberFormatter;
  import com.ibm.icu.number.NumberFormatter;
  import com.ibm.icu.text.DecimalFormat;

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
Simple merge

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/DecimalQuantityTest.java
Simple merge