ICU-13568 ICU-13400 ICU-13389 ICU-13075 Merging fixes from branch to trunk.

X-SVN-Rev: 40839

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
index 12b9a0535c74fb54d1dcf1a22cf57cc24e34d482,acb96411b16406dc74d192257ae0e6d6853d5306..ff59ca052cc57b4a913707d640311b586d5c4bc8
--- 1/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
--- 2/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
@@@ -9,8 -9,10 +9,9 @@@ import java.util.Comparator
  import java.util.List;
  
  import com.ibm.icu.impl.number.AffixPatternProvider;
 -import com.ibm.icu.impl.number.AffixUtils;
  import com.ibm.icu.impl.number.CustomSymbolCurrency;
  import com.ibm.icu.impl.number.DecimalFormatProperties;
+ import com.ibm.icu.impl.number.Grouper;
  import com.ibm.icu.impl.number.PatternStringParser;
  import com.ibm.icu.impl.number.PatternStringParser.ParsedPatternInfo;
  import com.ibm.icu.impl.number.PropertiesAffixPatternProvider;

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