Merge "Replace DecimalFormat_ICU58_Android with ICU4J DecimalFormat in compat mode"