Merge "Fix upstream icu4c bug in FieldPositionIterator."