ICU-13177 Merging trunk to branch

X-SVN-Rev: 40273

diff --cc icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
index e2354c1d213a6387dd0f5dfa53ca928acb9bd8e3,8daac03210482e879f3f985de447199e99048b51..4c913b6355590d6fce4f0f3616a97e817a42f155
--- 1/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
--- 2/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
@@@ -205,19 -204,12 +204,15 @@@ public class DecimalFormatSymbols imple
          digitStrings[0] = String.valueOf(zeroDigit);
          digits[0] = zeroDigit;
  
-         // Propagate digit 1 - 9 only when the input zeroDigit is a
-         // Unicode number and its integer value is 0.
- 
-         if (Character.digit(zeroDigit, 10) == 0) {
-             for (int i = 1; i < 10; i++) {
-                 char d = (char)(zeroDigit + i);
-                 digitStrings[i] = String.valueOf(d);
-                 digits[i] = d;
-             }
+         // Always propagate to digits 1-9 for JDK and ICU4C consistency.
+         for (int i = 1; i < 10; i++) {
+             char d = (char)(zeroDigit + i);
+             digitStrings[i] = String.valueOf(d);
+             digits[i] = d;
          }
 +
 +        // Update codePointZero: it is simply zeroDigit.
 +        codePointZero = zeroDigit;
      }
  
      /**

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

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