Merge branch 'master' into units-staging

author Shane Carr <shane@unicode.org>

Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)

committer Shane Carr <shane@unicode.org>

Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)
author Shane Carr <shane@unicode.org>
Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)
committer Shane Carr <shane@unicode.org>
Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)
diff --cc icu4c/source/data/misc/supplementalData.txt
Simple merge
diff --cc icu4c/source/i18n/measunit.cpp
Simple merge
diff --cc icu4c/source/i18n/unicode/measunit.h
Simple merge
author	Shane Carr <shane@unicode.org>
	Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)
committer	Shane Carr <shane@unicode.org>
	Fri, 13 Mar 2020 19:06:17 +0000 (12:06 -0700)
		1	2
icu4c/source/data/misc/supplementalData.txt	patch \|	diff1 \|	diff2 \|	blob \| history
icu4c/source/i18n/measunit.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
icu4c/source/i18n/unicode/measunit.h	patch \|	diff1 \|	diff2 \|	blob \| history