Snap for 5511141 from 6100e79c99eb955e340b965479e4ce1f58ce5f60 to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android10-mainline-releaseandroid10-mainline-a-release

Change-Id: I6c96155a97f686eb74a9b3ad26dbca4c8ccdb4eb

18 files changed, 36 insertions, 6 deletions

diff --git a/common/main/ar.xml b/common/main/ar.xml
index 82d2d8da..c7a56961 100644
--- a/common/main/ar.xml
+++ b/common/main/ar.xml
@@ -2524,6 +2524,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">تيشو</era>
 						<era type="234">شووا</era>
 						<era type="235">هيسي</era>
+						<era type="236" draft="contributed">ريوا</era>
 					</eraAbbr>
 				</eras>
 			</calendar>
diff --git a/common/main/bs_Cyrl.xml b/common/main/bs_Cyrl.xml
index 19c0b9a1..e409c651 100644
--- a/common/main/bs_Cyrl.xml
+++ b/common/main/bs_Cyrl.xml
@@ -1932,6 +1932,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="233">Таишо</era>
 						<era type="234">Шова</era>
 						<era type="235">Хаисеи</era>
+						<era type="236" draft="contributed">Реива</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/el.xml b/common/main/el.xml
index 1d27fc47..8bf7ca13 100644
--- a/common/main/el.xml
+++ b/common/main/el.xml
@@ -2478,6 +2478,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</eras>
 			</calendar>
 			<calendar type="japanese">
+				<eras>
+					<eraAbbr>
+						<era type="235" draft="contributed">Χεϊσέι</era>
+						<era type="236" draft="contributed">Ρέιβα</era>
+					</eraAbbr>
+				</eras>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
diff --git a/common/main/fa.xml b/common/main/fa.xml
index f20ccf18..69e73e8d 100644
--- a/common/main/fa.xml
+++ b/common/main/fa.xml
@@ -2460,6 +2460,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 				</dateTimeFormats>
 			</calendar>
+			<calendar type="japanese">
+				<eras>
+					<eraAbbr>
+						<era type="235" draft="contributed">هیسه‌ای</era>
+						<era type="236" draft="contributed">ریوا</era>
+					</eraAbbr>
+				</eras>
+			</calendar>
 			<calendar type="persian">
 				<months>
 					<monthContext type="format">
diff --git a/common/main/hi.xml b/common/main/hi.xml
index 1974d9e0..b0bcd7f0 100644
--- a/common/main/hi.xml
+++ b/common/main/hi.xml
@@ -2247,6 +2247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233" draft="contributed">ताईशो</era>
 						<era type="234" draft="contributed">शोवा</era>
 						<era type="235" draft="contributed">हेईसेई</era>
+						<era type="236" draft="contributed">रेइवा</era>
 					</eraAbbr>
 				</eras>
 			</calendar>
diff --git a/common/main/ja.xml b/common/main/ja.xml
index 66c6b829..74479ab2 100644
--- a/common/main/ja.xml
+++ b/common/main/ja.xml
@@ -3728,7 +3728,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">大正</era>
 						<era type="234">昭和</era>
 						<era type="235">平成</era>
-						<era type="236">ＱＱ</era>
+						<era type="236">令和</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">大化</era>
@@ -3967,7 +3967,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">T</era>
 						<era type="234">S</era>
 						<era type="235">H</era>
-						<era type="236">Q</era>
+						<era type="236">R</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
diff --git a/common/main/ko.xml b/common/main/ko.xml
index 9ef1f17b..670d15f3 100644
--- a/common/main/ko.xml
+++ b/common/main/ko.xml
@@ -3087,6 +3087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">다이쇼</era>
 						<era type="234">쇼와</era>
 						<era type="235">헤이세이</era>
+						<era type="236" draft="contributed">레이와</era>
 					</eraAbbr>
 				</eras>
 				<dateTimeFormats>
diff --git a/common/main/root.xml b/common/main/root.xml
index 0c58e3cf..a899b619 100644
--- a/common/main/root.xml
+++ b/common/main/root.xml
@@ -2111,7 +2111,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">Taishō</era>
 						<era type="234">Shōwa</era>
 						<era type="235">Heisei</era>
-						<era type="236">Qqqq</era>
+						<era type="236">Reiwa</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">Taika (645–650)</era>
@@ -2350,7 +2350,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">T</era>
 						<era type="234">S</era>
 						<era type="235">H</era>
-						<era type="236">Q</era>
+						<era type="236">R</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
diff --git a/common/main/ru.xml b/common/main/ru.xml
index 565952da..6a8cc142 100644
--- a/common/main/ru.xml
+++ b/common/main/ru.xml
@@ -2942,6 +2942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">Эпоха Тайсьо</era>
 						<era type="234">Сьова</era>
 						<era type="235">Эпоха Хэйсэй</era>
+						<era type="236" draft="contributed">Рэйва</era>
 					</eraAbbr>
 				</eras>
 			</calendar>
diff --git a/common/main/sr.xml b/common/main/sr.xml
index 22c659a2..8cdc7b34 100644
--- a/common/main/sr.xml
+++ b/common/main/sr.xml
@@ -2280,6 +2280,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">Таишо</era>
 						<era type="234">Шова</era>
 						<era type="235">Хаисеи</era>
+						<era type="236" draft="contributed">Реива</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/sr_Latn.xml b/common/main/sr_Latn.xml
index cf55b886..f8ac764b 100644
--- a/common/main/sr_Latn.xml
+++ b/common/main/sr_Latn.xml
@@ -2279,6 +2279,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="233">Taišo</era>
 						<era type="234">Šova</era>
 						<era type="235">Haisei</era>
+						<era type="236" draft="contributed">Reiva</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/th.xml b/common/main/th.xml
index 142edb6c..d8bc5274 100644
--- a/common/main/th.xml
+++ b/common/main/th.xml
@@ -3570,6 +3570,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">ทะอิโช</era>
 						<era type="234">โชวะ</era>
 						<era type="235">เฮเซ</era>
+						<era type="236" draft="contributed">เรวะ</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/uk.xml b/common/main/uk.xml
index ac08cf9e..28ff7d0d 100644
--- a/common/main/uk.xml
+++ b/common/main/uk.xml
@@ -2714,7 +2714,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="232" draft="provisional">Мейдзі</era>
 						<era type="233" draft="provisional">Тайсьо</era>
 						<era type="234" draft="provisional">Сьова</era>
-						<era type="235" draft="provisional">Хейсей</era>
+						<era type="235" draft="contributed">Хейсей</era>
+						<era type="236" draft="contributed">Рейва</era>
 					</eraAbbr>
 				</eras>
 			</calendar>
diff --git a/common/main/yue.xml b/common/main/yue.xml
index d19152c1..c4aab285 100644
--- a/common/main/yue.xml
+++ b/common/main/yue.xml
@@ -3519,6 +3519,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="233">大正</era>
 						<era type="234">昭和</era>
 						<era type="235">平成</era>
+						<era type="236">令和</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/yue_Hans.xml b/common/main/yue_Hans.xml
index 175b4c46..2461ae14 100644
--- a/common/main/yue_Hans.xml
+++ b/common/main/yue_Hans.xml
@@ -3520,6 +3520,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<era type="233">大正</era>
 						<era type="234">昭和</era>
 						<era type="235">平成</era>
+						<era type="236">令和</era>
 					</eraAbbr>
 				</eras>
 				<dateFormats>
diff --git a/common/main/zh.xml b/common/main/zh.xml
index 4994d85a..55107813 100644
--- a/common/main/zh.xml
+++ b/common/main/zh.xml
@@ -3989,6 +3989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233" draft="contributed">大正</era>
 						<era type="234" draft="contributed">昭和</era>
 						<era type="235" draft="contributed">平成</era>
+						<era type="236" draft="contributed">令和</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">大化 (645–650)</era>
@@ -4227,6 +4228,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">大正</era>
 						<era type="234">昭和</era>
 						<era type="235">平成</era>
+						<era type="236">令和</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0">大化(645–650)</era>
diff --git a/common/main/zh_Hant.xml b/common/main/zh_Hant.xml
index 94553589..5a6b2d3e 100644
--- a/common/main/zh_Hant.xml
+++ b/common/main/zh_Hant.xml
@@ -5974,6 +5974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233" draft="contributed">大正</era>
 						<era type="234" draft="contributed">昭和</era>
 						<era type="235" draft="contributed">平成</era>
+						<era type="236" draft="contributed">令和</era>
 					</eraNames>
 					<!-- per cldrbug 2835, accept provisional -->
 					<eraAbbr>
@@ -6213,6 +6214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233">大正</era>
 						<era type="234">昭和</era>
 						<era type="235">平成</era>
+						<era type="236">令和</era>
 					</eraAbbr>
 					<eraNarrow>
 						<era type="0" draft="contributed">大化</era>
@@ -6451,6 +6453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<era type="233" draft="contributed">大正</era>
 						<era type="234" draft="contributed">昭和</era>
 						<era type="235" draft="contributed">平成</era>
+						<era type="236" draft="contributed">令和</era>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index d6430494..8b5f01f5 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -4536,7 +4536,7 @@ XXX Code for transations where no currency is involved
               <era type="233" start="1912-7-30"/>
               <era type="234" start="1926-12-25"/>
               <era type="235" start="1989-1-8"/>
-              <era type="236" start="2019-5-1" named="false"/>
+              <era type="236" start="2019-5-1"/>
           </eras>
         </calendar>
         <calendar type="islamic">