DO NOT MERGE Track tzdb 2023d update. [Q CTS]android10-tests-dev

TimeZoneTest#TestCanonicalID was already marked as ignored,
only comment was added / updated.

Q branch took only 2023d changes (Greenland and Antarctica), so
some tests which are updated in S+ branches are not updated here.

Bug: 324853074
Test: run cts -m CtsIcuTestCases -t android.icu.dev.test.timezone.TimeZoneTest
Test: on ab/11461191 (2022a) instance.

Change-Id: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
Merged-In: Iaa6859d792626a0f5b3ce1b92521b380421c52ab

3 files changed, 14 insertions, 4 deletions

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
index 46b468394..8d40a691a 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
@@ -1505,7 +1505,11 @@ public class TimeZoneTest extends TestFmwk
     }
 
     @Test
-    @Ignore
+    // Android-added: Ignore this test on CTS branches.
+    // This test is written is such a way that it is heavily coupled with
+    // tzdata. Keeping it passing with system image tzdata and a newer one, which changes
+    // canonicality rules (i.e. 2023d), would probably mean re-writing this test.
+    @org.junit.Ignore
     public void TestCanonicalID() {
         // Olson (IANA) tzdata used to have very few "Link"s long time ago.
         // This test case was written when most of CLDR canonical time zones are
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index 6658cacfb..4aebeb4a7 100644
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -67,8 +67,10 @@ void TimeZoneTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
     TESTCASE_AUTO(TestFractionalDST);
     TESTCASE_AUTO(TestFebruary);
     TESTCASE_AUTO(TestCanonicalIDAPI);
-    // Android-changed: b/228944103 Ignore test instead of adjusting to pass
-    // both w/ and w/o 2022a updates applied.
+    // Android-changed: Ignore this test on CTS branches.
+    // This test is written is such a way that it is heavily coupled with
+    // tzdata. Keeping it passing with system image tzdata and a newer one, which changes
+    // canonicality rules (i.e. 2023d), would probably mean re-writing this test.
     // TESTCASE_AUTO(TestCanonicalID);
     TESTCASE_AUTO(TestDisplayNamesMeta);
     TESTCASE_AUTO(TestGetRegion);
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index c6b4d11ee..2cafe308c 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1502,7 +1502,11 @@ public class TimeZoneTest extends TestFmwk
     }
 
     @Test
-    @Ignore
+    // Android-added: Ignore this test on CTS branches.
+    // This test is written is such a way that it is heavily coupled with
+    // tzdata. Keeping it passing with system image tzdata and a newer one, which changes
+    // canonicality rules (i.e. 2023d), would probably mean re-writing this test.
+    @org.junit.Ignore
     public void TestCanonicalID() {
         // Olson (IANA) tzdata used to have very few "Link"s long time ago.
         // This test case was written when most of CLDR canonical time zones are