Update Android TZDB from 2023a to 2023d

Notes for Android time zone maintainers:
Like all tzdb updates, the binary files in this commit should not be
patched to other release branches: they are not guaranteed to work.
Also note that there are associated changes in external/icu and often
others that should also be applied.  tzdb updates are incremental
changes: all previous tzdb updates should be applied.  Look for
aosp/<release>-dev changes for backports. If you have a local branch
with ICU changes the ICU .dat file in external/icu will not apply
cleanly.  Instead, make equivalent changes to text files and run
system/timezone/update-tzdata.py.

---------------

IANA release 2023d notes:
  Ittoqqortoormiit, Greenland changes time zones on 2024-03-31.
  Vostok, Antarctica changed time zones on 2023-12-18.
  Casey, Antarctica changed time zones five times since 2020.
  Code and data fixes for Palestine timestamps starting in 2072.

Please note "Changes to past tm_isdst flags" section in the NEWS:
this update does not change UTC offsets, but changes tm_isdst flags
for timestamps in 2023 in Greenland time zones.

Date & Time screen will show 4 time zones in Greenland as what
now identical time zones to show is defined by MIN_USE_DATE_OF_TIMEZONE.

Bug: 318333787

Test: run cts --include-filter CtsLibcoreTestCases
Test: run cts --include-filter CtsLibcoreOjTestCases
Test: run cts --include-filter CtsIcuTestCases
Test: run cts --include-filter CtsBionicTestCases
Test: run cts --include-filter CtsTextTestCases
Test: atest MtsTimeZoneDataTestCases
Test: "adb shell dumpsys runtime" reports 2023d

Change-Id: I466777b12c91d089a536d2a4b8f1c6a97fd95402
Merged-In: I466777b12c91d089a536d2a4b8f1c6a97fd95402

17 files changed, 55 insertions, 36 deletions

diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index eb717ef0..7750bfd1 100644
--- a/input_data/android/countryzones.txt
+++ b/input_data/android/countryzones.txt
@@ -25,7 +25,7 @@
 # a time zone for an Android device.
 
 # ianaVersion: The version of the IANA rules this file matches.
-ianaVersion:"2023a"
+ianaVersion:"2023d"
 
 # countries:
 #
@@ -255,7 +255,7 @@ countries:<
   >
 
   timeZoneMappings:<
-    utcOffset:"11:00"
+    utcOffset:"8:00"
     id:"Antarctica/Casey"
   >
 
@@ -270,7 +270,7 @@ countries:<
   >
 
   timeZoneMappings:<
-    utcOffset:"6:00"
+    utcOffset:"5:00"
     id:"Antarctica/Vostok"
   >
 
@@ -1514,22 +1514,32 @@ countries:<
   timeZoneMappings:<
     utcOffset:"0:00"
     id:"America/Danmarkshavn"
+    # Setting lowest possible value.
+    priority:1
   >
 
   timeZoneMappings:<
-    utcOffset:"-1:00"
-    id:"America/Scoresbysund"
+    utcOffset:"-2:00"
+    id:"America/Nuuk"
+    alternativeIds: "America/Godthab"
+    # Population of Nuuk was 17635 (2017) according to Wikipedia.
+    priority:17
   >
 
   timeZoneMappings:<
     utcOffset:"-2:00"
-    id:"America/Nuuk"
-    alternativeIds: "America/Godthab"
+    id:"America/Scoresbysund"
+    # Scoresbysund's (now known as Ittoqqortoormiit) population was 345 (2020) according to
+    # Wikipedia.
+    priority:1
   >
 
   timeZoneMappings:<
     utcOffset:"-4:00"
     id:"America/Thule"
+    # Qaanaaq's, formerly known as Thule or New Thule, population was 646 (2020) according to
+    # Wikipedia.
+    priority:1
   >
 >
 
diff --git a/input_data/iana/tzdata2023a.tar.gz b/input_data/iana/tzdata2023a.tar.gz
deleted file mode 100644
index 825ee436..00000000
--- a/input_data/iana/tzdata2023a.tar.gz
+++ /dev/null
diff --git a/input_data/iana/tzdata2023a.tar.gz.asc b/input_data/iana/tzdata2023a.tar.gz.asc
deleted file mode 100644
index 5658527e..00000000
--- a/input_data/iana/tzdata2023a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq
-fjRngg/8D8E5sJIt412pmR7yIQYnsG44nSiELNpiewG+SF4DofW7quQDQEjDMdVn
-seLU9okE1/l+1SN6eibMJgvho/6HWkU9kWLzYCY29sljTVYqEu6vLo1IY1OJIkjC
-9yieL33oLkN4LIeSMzR4QOCkRfusYNRYq3uryVtMu7R6HP2PgMlmmJf/imV192tj
-ONJXNA4Y30EvJ3lHuXMbr7fNg9hXSLjRy1NPKjp5OVZ3jZVXPljrC+egAfhLjZdQ
-uB5a3uGjAX+KjemCHwTmrrmmcUlaHxFxlfN5gX5cNIXuyrYtz0PAhy+MhBM5F9iY
-erYWg6EfBr7IfSyS1JcDZ1ypwZ66EpKxXfWZNm+HFA4dDdnWgvlM4n1OyKjw03Dq
-4/agYr34cUDhfBUS57dtpZSibtdpbh8oiqxc+wXV3KZcHXVpX3XRyGTH1UVINfnF
-nXArC09JKUt7Tjol83TPH0jDXJAxabkgUDJHfpeQ5A8r3GNW1PQ/OF25ieRb+AFQ
-jWFbiEIxSXmUwnRc6wHiLX/gU0TT7vVMokN5erx9IGwrDEQAljuEJoj2bYFT/q9D
-8jFA+48r/nK2r33+OBrz6aryoMNptquuMG0XR4aSr6KO3e622+vuF4nSN7hg2sAM
-/bMLSlzOGUEmOZ2D7hP5MDdWw5L0WQAjX7/8xKzdlMhqkx4Mc9Q=
-=OxWX
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2023d.tar.gz b/input_data/iana/tzdata2023d.tar.gz
new file mode 100644
index 00000000..1d3df379
--- /dev/null
+++ b/input_data/iana/tzdata2023d.tar.gz
diff --git a/input_data/iana/tzdata2023d.tar.gz.asc b/input_data/iana/tzdata2023d.tar.gz.asc
new file mode 100644
index 00000000..45ea5e17
--- /dev/null
+++ b/input_data/iana/tzdata2023d.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmWFCxkACgkQ7ZfpDmKq
+fjRuUxAAoioAZhZkP9DnoNvoo2YG+g4gxS4GIIw1KK6nhZqIN8F9e4wrvw6/++x/
+7FNP2+KV7ObTNlqeONv2niAL8zuFq8VhkN60D4j1qEu9H21Wxp6HFWOFEWi8l5TS
+l6dp4S1Rb5LmCVlbj2MbrbE6Qc+QptSdGuw12MQR34b5F8pX39vt+edMfHvA2lw0
+KhMkELOaBhKCAoiVHC8onUZvCg5qEpynQ88LpKgnLWslT9fcU3m0mCuiXldSn5kp
+KppIlAFp6WuaKIJiuj61gjH9Py00PM7ww1+0eZbnbametmM3E2Or+YoP1pm5bIy8
+77+iVCvBu+B1aW/cC1h2k3vLRUg8sFxMvGJdpow6JN1D+2e3Flk8+A8DPwRXtCRV
+yjjGOzIltbWwD7fisPKbvXSrVlQmMrNLMoyQcljZbYUa5nhTMoCiv+yed/DzG2ZF
+pwAJguKenamOiRpChFfkrVXBn/AWr4G7FVAogckFClz7qP6KSekJ0h1MzUw31c5g
+8XZEwXNO2RGLbhgCw5uLg3V2KUvurSYGSBB46TnMNBLz1xRNelzkJ7XvJVIhxCEN
+L1t32v4jbD4YtXHqNugVId9uY3x8ed8SPdFy+8C2OqKY0TiWOTiAH2rz3vcz2L6O
+rsubE+4g/LUQI0fS9hTcabD9RcsP3k3/h2fZYLORM6frwuZA82U=
+=ylD7
+-----END PGP SIGNATURE-----
diff --git a/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java b/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
index 1806cfd4..90d75694 100644
--- a/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
+++ b/input_tools/android/tzlookup_generator/src/test/java/com/android/libcore/timezone/tzlookup/TzLookupGeneratorTest.java
@@ -391,22 +391,26 @@ public class TzLookupGeneratorTest {
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"0:00\"\n"
                 + "  id:\"America/Danmarkshavn\"\n"
+                + "  priority:1\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
-                + "  utcOffset:\"-1:00\"\n"
-                + "  id:\"America/Scoresbysund\"\n"
+                + "  utcOffset:\"-2:00\"\n"
+                + "  id:\"America/Godthab\"\n"
+                + "  alternativeIds: \"America/Nuuk\"\n"
+                + "  priority: 17\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"-2:00\"\n"
-                + "  id:\"America/Godthab\"\n"
-                + "  alternativeIds: \"America/Nuuk\"\n"
+                + "  id:\"America/Scoresbysund\"\n"
+                + "  priority:1\n"
                 + ">\n"
                 + "\n"
                 + "timeZoneMappings:<\n"
                 + "  utcOffset:\"-4:00\"\n"
                 + "  id:\"America/Thule\"\n"
+                + "  priority:1\n"
                 + ">\n";
         Country country = parseCountry(countryZonesWithOldIdText);
         List<ZoneTabFile.CountryEntry> zoneTabWithNewIds = Arrays.asList(
@@ -419,7 +423,8 @@ public class TzLookupGeneratorTest {
         OutputData outputData = generateOutputData(country, zoneTabWithNewIds);
 
         String expectedTzLookupOutput = "<id>America/Danmarkshavn</id>\n"
-                + "<id>America/Scoresbysund</id>\n"
+                + "<id notafter=\"1711846800000\" repl=\"America/Godthab\">"
+                + "America/Scoresbysund</id>\n"
                 + "<id alts=\"America/Nuuk\">America/Godthab</id>\n"
                 + "<id>America/Thule</id>\n";
         String[] expectedTzLookupXmlLines = expectedTzLookupOutput.split("\\n");
@@ -434,13 +439,13 @@ public class TzLookupGeneratorTest {
         TzIdsProto.CountryMapping.Builder b = TzIdsProto.CountryMapping.newBuilder()
                 .setIsoCode("gl")
                 .addTimeZoneIds("America/Danmarkshavn")
-                .addTimeZoneIds("America/Scoresbysund")
                 .addTimeZoneIds("America/Godthab")
                 .addTimeZoneIds("America/Thule");
 
         // Because Android lists America/Nuuk in alternativeIds in countryzones.txt, the link will
         // be reversed from the usual.
         addLink(b, "America/Nuuk" /* alternativeId */, "America/Godthab" /* preferredId */);
+        addReplacement(b, 1711846800000L, "America/Godthab", "America/Scoresbysund");
 
         tzIdsBuilder.addCountryMappings(b);
         assertEquals(tzIdsBuilder.build(), outputData.timeZoneIds);
diff --git a/output_data/android/tzids.prototxt b/output_data/android/tzids.prototxt
index 1395cd50..868a151f 100644
--- a/output_data/android/tzids.prototxt
+++ b/output_data/android/tzids.prototxt
@@ -1,5 +1,5 @@
 # Autogenerated file - DO NOT EDIT.
-ianaVersion: "2023a"
+ianaVersion: "2023d"
 countryMappings {
   isoCode: "ad"
   timeZoneIds: "Europe/Andorra"
@@ -822,13 +822,17 @@ countryMappings {
 countryMappings {
   isoCode: "gl"
   timeZoneIds: "America/Danmarkshavn"
-  timeZoneIds: "America/Scoresbysund"
   timeZoneIds: "America/Nuuk"
   timeZoneIds: "America/Thule"
   timeZoneLinks {
     alternativeId: "America/Godthab"
     preferredId: "America/Nuuk"
   }
+  timeZoneReplacements {
+    replacedId: "America/Scoresbysund"
+    replacementId: "America/Nuuk"
+    fromMillis: 1711846800000
+  }
 }
 countryMappings {
   isoCode: "gm"
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 022a815d..a3a11287 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2023a">
+--><timezones ianaversion="2023d">
  <countryzones>
   <country code="ad" default="Europe/Andorra" everutc="n">
    <id>Europe/Andorra</id>
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index 2749d102..f3279182 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index ec60f133..f025fa25 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 341efd4b..be32e263 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-007.001|2023a|001
\ No newline at end of file
+007.001|2023d|001
\ No newline at end of file
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml
index 60c0bb7e..c83113c0 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 3f155ab8..c133133a 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
index 3cf468e7..be09ef05 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index 60c0bb7e..c83113c0 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -331,8 +331,8 @@
   </country>
   <country code="gl" default="America/Nuuk" everutc="y">
    <id>America/Danmarkshavn</id>
-   <id>America/Scoresbysund</id>
    <id alts="America/Godthab">America/Nuuk</id>
+   <id notafter="1711846800000" repl="America/Nuuk">America/Scoresbysund</id>
    <id>America/Thule</id>
   </country>
   <country code="gm" default="Africa/Banjul" everutc="y">
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 3f155ab8..c133133a 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
diff --git a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
index 09f7bef5..70a88225 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat