ICU-20511 Merge branch 'master' into 64-merge-branch

diff --cc icu4c/source/i18n/number_output.cpp
index 6f4e2482044f142562cd102b8e132c12edc38176,888a9f254634d667c38547c96ff6b86068ce5c8b..8804916ace7a3cabad895275a359845ad911d4b1
--- 1/icu4c/source/i18n/number_output.cpp
--- 2/icu4c/source/i18n/number_output.cpp
+++ b/icu4c/source/i18n/number_output.cpp
@@@ -31,8 -29,8 +30,8 @@@ void FormattedNumber::getAllFieldPositi
  
  void FormattedNumber::getAllFieldPositionsImpl(FieldPositionIteratorHandler& fpih,
                                                 UErrorCode& status) const {
 -    UPRV_FORMATTED_VALUE_METHOD_GUARD()
 +    UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG)
-     fData->getStringRef().getAllFieldPositions(fpih, status);
+     fData->getAllFieldPositions(fpih, status);
  }
  
  void FormattedNumber::getDecimalQuantity(impl::DecimalQuantity& output, UErrorCode& status) const {

diff --cc icu4c/source/i18n/numparse_types.h
Simple merge

diff --cc icu4c/source/i18n/numrange_fluent.cpp
index b284561cdc2b6f0bffabe3446767751b14d86652,a788108ae637c662650b733e7ae5f982c8b2be95..654cafaf00bc821053f6d264ee687064e17f7f5e
--- 1/icu4c/source/i18n/numrange_fluent.cpp
--- 2/icu4c/source/i18n/numrange_fluent.cpp
+++ b/icu4c/source/i18n/numrange_fluent.cpp
@@@ -392,8 -391,8 +392,8 @@@ void FormattedNumberRange::getAllFieldP
  
  void FormattedNumberRange::getAllFieldPositionsImpl(
          FieldPositionIteratorHandler& fpih, UErrorCode& status) const {
 -    UPRV_FORMATTED_VALUE_METHOD_GUARD()
 +    UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG)
-     fData->getStringRef().getAllFieldPositions(fpih, status);
+     fData->getAllFieldPositions(fpih, status);
  }
  
  UnicodeString FormattedNumberRange::getFirstDecimal(UErrorCode& status) const {

diff --cc icu4c/source/i18n/unicode/numberformatter.h
Simple merge

diff --cc icu4c/source/test/intltest/numbertest_api.cpp
Simple merge