DO NOT MERGE Track tzdb 2021a3 update. [Q CTS]

ICU's tzdata 2021a3 changes canonicalisation rules for some time zones.
This CL updates tests assosiated with these changes with one minor
change: Android skipped change which makes America/Panama canonical
representation of America/Coral_Harbour.

Only test changes are kept, binary and txt files left as they were.

Bug: 204757016
Test: see system/timezone CL

Change-Id: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5
Merged-In: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5

3 files changed, 26 insertions, 12 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 83b664e0f..b0ed3808c 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
@@ -552,10 +552,10 @@ public class TimeZoneTest extends TestFmwk
 
 
         String tzver = TimeZone.getTZDataVersion();
-        if (tzver.length() != 5 /* 4 digits + 1 letter */) {
-            errln("FAIL: getTZDataVersion returned " + tzver);
-        } else {
+        if (tzver != null && (tzver.length() == 5 || tzver.length() == 6) /* 4 digits + 1 or 2 letters */ ) {
             logln("PASS: tzdata version: " + tzver);
+        } else {
+            errln("FAIL: getTZDataVersion returned " + tzver);
         }
     }
 
@@ -1544,6 +1544,12 @@ public class TimeZoneTest extends TestFmwk
                 {"Africa/Sao_Tome", "Africa/Abidjan"},
                 {"America/Antigua", "America/Port_of_Spain"},
                 {"America/Anguilla", "America/Port_of_Spain"},
+                {"America/Cayman", "America/Panama"},
+                // TODO(b/204533494): enable this check back.
+                // Android-Changed: due to issues with time zones canonicity, decision was made
+                // to keep America/Coral_Harbour as alias to America/Atikokan.
+                // See more details in system/timezone/RELEASE_NOTES.md
+                // {"America/Coral_Harbour", "America/Panama"},
                 {"America/Curacao", "America/Aruba"},
                 {"America/Dominica", "America/Port_of_Spain"},
                 {"America/Grenada", "America/Port_of_Spain"},
@@ -1552,7 +1558,6 @@ public class TimeZoneTest extends TestFmwk
                 {"America/Lower_Princes", "America/Aruba"},
                 {"America/Marigot", "America/Port_of_Spain"},
                 {"America/Montserrat", "America/Port_of_Spain"},
-                {"America/Panama", "America/Cayman"},
                 {"America/Santa_Isabel", "America/Tijuana"},
                 {"America/Shiprock", "America/Denver"},
                 {"America/St_Barthelemy", "America/Port_of_Spain"},
@@ -1562,7 +1567,7 @@ public class TimeZoneTest extends TestFmwk
                 {"America/St_Vincent", "America/Port_of_Spain"},
                 {"America/Toronto", "America/Montreal"},
                 {"America/Tortola", "America/Port_of_Spain"},
-                {"America/Virgin", "America/Port_of_Spain"},
+                {"America/Virgin", "America/Puerto_Rico"},
                 {"Antarctica/South_Pole", "Antarctica/McMurdo"},
                 {"Arctic/Longyearbyen", "Europe/Oslo"},
                 {"Asia/Kuwait", "Asia/Aden"},
@@ -1653,7 +1658,7 @@ public class TimeZoneTest extends TestFmwk
             if (!bFoundCanonical) {
                 // test exclusion because of differences between Olson tzdata and CLDR
                 boolean isExcluded = false;
-                for (int k = 0; k < excluded1.length; k++) {
+                for (int k = 0; k < excluded2.length; k++) {
                     if (ids[i].equals(excluded2[k])) {
                         isExcluded = true;
                         break;
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index af88cc461..03f953f15 100644
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -1219,7 +1219,6 @@ TimeZoneTest::TestAliasedNames()
         {"America/Argentina/Cordoba", "America/Cordoba"},
         {"America/Argentina/Jujuy", "America/Jujuy"},
         {"America/Argentina/Mendoza", "America/Mendoza"},
-        {"America/Atikokan", "America/Coral_Harbour"},
         {"America/Atka", "America/Adak"},
         {"America/Ensenada", "America/Tijuana"},
         {"America/Fort_Wayne", "America/Indianapolis"},
@@ -2046,6 +2045,12 @@ void TimeZoneTest::TestCanonicalID() {
         {"Africa/Sao_Tome", "Africa/Abidjan"},
         {"America/Antigua", "America/Port_of_Spain"},
         {"America/Anguilla", "America/Port_of_Spain"},
+        {"America/Cayman", "America/Panama"},
+        // TODO(b/204533494): enable this check back.
+        // Android-Changed: due to issues with time zones canonicity, decision was made to keep
+        // America/Coral_Harbour as alias to America/Atikokan.
+        // See more details in system/timezone/RELEASE_NOTES.md
+        // {"America/Coral_Harbour", "America/Panama"},
         {"America/Curacao", "America/Aruba"},
         {"America/Dominica", "America/Port_of_Spain"},
         {"America/Grenada", "America/Port_of_Spain"},
@@ -2054,7 +2059,6 @@ void TimeZoneTest::TestCanonicalID() {
         {"America/Lower_Princes", "America/Aruba"},
         {"America/Marigot", "America/Port_of_Spain"},
         {"America/Montserrat", "America/Port_of_Spain"},
-        {"America/Panama", "America/Cayman"},
         {"America/Santa_Isabel", "America/Tijuana"},
         {"America/Shiprock", "America/Denver"},
         {"America/St_Barthelemy", "America/Port_of_Spain"},
@@ -2064,7 +2068,7 @@ void TimeZoneTest::TestCanonicalID() {
         {"America/St_Vincent", "America/Port_of_Spain"},
         {"America/Toronto", "America/Montreal"},
         {"America/Tortola", "America/Port_of_Spain"},
-        {"America/Virgin", "America/Port_of_Spain"},
+        {"America/Virgin", "America/Puerto_Rico"},
         {"Antarctica/South_Pole", "Antarctica/McMurdo"},
         {"Arctic/Longyearbyen", "Europe/Oslo"},
         {"Asia/Kuwait", "Asia/Aden"},
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 2d494377d..4cde05963 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
@@ -1541,6 +1541,12 @@ public class TimeZoneTest extends TestFmwk
                 {"Africa/Sao_Tome", "Africa/Abidjan"},
                 {"America/Antigua", "America/Port_of_Spain"},
                 {"America/Anguilla", "America/Port_of_Spain"},
+                {"America/Cayman", "America/Panama"},
+                // TODO(b/204533494): enable this check back.
+                // Android-Changed: due to issues with time zones canonicity, decision was made
+                // to keep America/Coral_Harbour as alias to America/Atikokan.
+                // See more details in system/timezone/RELEASE_NOTES.md
+                // {"America/Coral_Harbour", "America/Panama"},
                 {"America/Curacao", "America/Aruba"},
                 {"America/Dominica", "America/Port_of_Spain"},
                 {"America/Grenada", "America/Port_of_Spain"},
@@ -1549,7 +1555,6 @@ public class TimeZoneTest extends TestFmwk
                 {"America/Lower_Princes", "America/Aruba"},
                 {"America/Marigot", "America/Port_of_Spain"},
                 {"America/Montserrat", "America/Port_of_Spain"},
-                {"America/Panama", "America/Cayman"},
                 {"America/Santa_Isabel", "America/Tijuana"},
                 {"America/Shiprock", "America/Denver"},
                 {"America/St_Barthelemy", "America/Port_of_Spain"},
@@ -1559,7 +1564,7 @@ public class TimeZoneTest extends TestFmwk
                 {"America/St_Vincent", "America/Port_of_Spain"},
                 {"America/Toronto", "America/Montreal"},
                 {"America/Tortola", "America/Port_of_Spain"},
-                {"America/Virgin", "America/Port_of_Spain"},
+                {"America/Virgin", "America/Puerto_Rico"},
                 {"Antarctica/South_Pole", "Antarctica/McMurdo"},
                 {"Arctic/Longyearbyen", "Europe/Oslo"},
                 {"Asia/Kuwait", "Asia/Aden"},
@@ -1650,7 +1655,7 @@ public class TimeZoneTest extends TestFmwk
             if (!bFoundCanonical) {
                 // test exclusion because of differences between Olson tzdata and CLDR
                 boolean isExcluded = false;
-                for (int k = 0; k < excluded1.length; k++) {
+                for (int k = 0; k < excluded2.length; k++) {
                     if (ids[i].equals(excluded2[k])) {
                         isExcluded = true;
                         break;