Snap ICU timezone-related .txt files to latest

This commit pulls in recent ICU changes to timezone
related files. This is before applying the upcoming 2016i
update so we will not carry spurious diffs.

Upstream ICU have changed their file headers and updated
windowsZones.txt with updates to Europe/Simferopol specifically,
and for CLDR 30 generally.

See: http://unicode.org/cldr/trac/ticket/9816 for information
on the Simferopol change. This change to Android is a technical
change to reduce differences, not a political stance.

These files correspond to:

data/trunk/tzdata/supplemental/metaZones.txt r39391
data/trunk/tzdata/supplemental/timezoneTypes.txt r39391
data/trunk/tzdata/supplemental/windowsZones.txt r39460

This commit also relaxes an ICU test that
fails when the windowsZones.txt change is taken. This allows devices
that have taken the windowsZones.txt change as well as those that
have not to pass the tests. The behavior is effectively left "undefined"
by this change.

The ability to map this specific IANA timezone ID to a
Windows ID is unlikely to affect actual app compatibility. The
windowsZones.txt change will affect the behavior of some
android.icu.util.TimeZone methods related to Windows IDs.

Bug: 32655082
Bug: 32512035
Bug: 32534123
Test: CtsLibcoreTestCases / CtsIcuTestCases
Change-Id: Icb8371cabb72c2f09237d93a3767a9c894cd8859

1 files changed, 90 insertions, 20 deletions

diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index 14a4b8b82..37e4adf53 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -1,11 +1,5 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2016 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/windowsZones.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 windowsZones:table(nofallback){
     mapTimezones{
         "AUS Central Standard Time"{
@@ -27,9 +21,13 @@ windowsZones:table(nofallback){
                 "rica/Sitka America/Yakutat"
             }
         }
+        "Aleutian Standard Time"{
+            001{"America/Adak"}
+            US{"America/Adak"}
+        }
         "Altai Standard Time"{
             001{"Asia/Barnaul"}
-            RU{"Asia/Barnaul Asia/Tomsk"}
+            RU{"Asia/Barnaul"}
         }
         "Arab Standard Time"{
             001{"Asia/Riyadh"}
@@ -68,6 +66,10 @@ windowsZones:table(nofallback){
             CA{"America/Halifax America/Glace_Bay America/Goose_Bay America/Moncton"}
             GL{"America/Thule"}
         }
+        "Aus Central W. Standard Time"{
+            001{"Australia/Eucla"}
+            AU{"Australia/Eucla"}
+        }
         "Azerbaijan Standard Time"{
             001{"Asia/Baku"}
             AZ{"Asia/Baku"}
@@ -90,6 +92,10 @@ windowsZones:table(nofallback){
             001{"Europe/Minsk"}
             BY{"Europe/Minsk"}
         }
+        "Bougainville Standard Time"{
+            001{"Pacific/Bougainville"}
+            PG{"Pacific/Bougainville"}
+        }
         "Canada Central Standard Time"{
             001{"America/Regina"}
             CA{"America/Regina America/Swift_Current"}
@@ -153,8 +159,6 @@ windowsZones:table(nofallback){
             AU{"Antarctica/Macquarie"}
             FM{"Pacific/Ponape Pacific/Kosrae"}
             NC{"Pacific/Noumea"}
-            NF{"Pacific/Norfolk"}
-            PG{"Pacific/Bougainville"}
             SB{"Pacific/Guadalcanal"}
             VU{"Pacific/Efate"}
             ZZ{"Etc/GMT-11"}
@@ -180,12 +184,20 @@ windowsZones:table(nofallback){
             }
             ZZ{"CST6CDT"}
         }
+        "Chatham Islands Standard Time"{
+            001{"Pacific/Chatham"}
+            NZ{"Pacific/Chatham"}
+        }
         "China Standard Time"{
             001{"Asia/Shanghai"}
             CN{"Asia/Shanghai"}
             HK{"Asia/Hong_Kong"}
             MO{"Asia/Macau"}
         }
+        "Cuba Standard Time"{
+            001{"America/Havana"}
+            CU{"America/Havana"}
+        }
         "Dateline Standard Time"{
             001{"Etc/GMT+12"}
             ZZ{"Etc/GMT+12"}
@@ -219,6 +231,10 @@ windowsZones:table(nofallback){
             001{"America/Sao_Paulo"}
             BR{"America/Sao_Paulo"}
         }
+        "Easter Island Standard Time"{
+            001{"Pacific/Easter"}
+            CL{"Pacific/Easter"}
+        }
         "Eastern Standard Time (Mexico)"{
             001{"America/Cancun"}
             MX{"America/Cancun"}
@@ -230,7 +246,6 @@ windowsZones:table(nofallback){
                 "America/Toronto America/Iqaluit America/Montreal America/Nipigon Ame"
                 "rica/Pangnirtung America/Thunder_Bay"
             }
-            CU{"America/Havana"}
             US{
                 "America/New_York America/Detroit America/Indiana/Petersburg America/"
                 "Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell"
@@ -303,6 +318,10 @@ windowsZones:table(nofallback){
             ST{"Africa/Sao_Tome"}
             TG{"Africa/Lome"}
         }
+        "Haiti Standard Time"{
+            001{"America/Port-au-Prince"}
+            HT{"America/Port-au-Prince"}
+        }
         "Hawaiian Standard Time"{
             001{"Pacific/Honolulu"}
             CK{"Pacific/Rarotonga"}
@@ -344,10 +363,18 @@ windowsZones:table(nofallback){
             KI{"Pacific/Kiritimati"}
             ZZ{"Etc/GMT-14"}
         }
+        "Lord Howe Standard Time"{
+            001{"Australia/Lord_Howe"}
+            AU{"Australia/Lord_Howe"}
+        }
         "Magadan Standard Time"{
             001{"Asia/Magadan"}
             RU{"Asia/Magadan"}
         }
+        "Marquesas Standard Time"{
+            001{"Pacific/Marquesas"}
+            PF{"Pacific/Marquesas"}
+        }
         "Mauritius Standard Time"{
             001{"Indian/Mauritius"}
             MU{"Indian/Mauritius"}
@@ -388,7 +415,7 @@ windowsZones:table(nofallback){
         }
         "N. Central Asia Standard Time"{
             001{"Asia/Novosibirsk"}
-            RU{"Asia/Novosibirsk Asia/Omsk"}
+            RU{"Asia/Novosibirsk"}
         }
         "Namibia Standard Time"{
             001{"Africa/Windhoek"}
@@ -407,6 +434,10 @@ windowsZones:table(nofallback){
             001{"America/St_Johns"}
             CA{"America/St_Johns"}
         }
+        "Norfolk Standard Time"{
+            001{"Pacific/Norfolk"}
+            NF{"Pacific/Norfolk"}
+        }
         "North Asia East Standard Time"{
             001{"Asia/Irkutsk"}
             RU{"Asia/Irkutsk"}
@@ -419,15 +450,22 @@ windowsZones:table(nofallback){
             001{"Asia/Pyongyang"}
             KP{"Asia/Pyongyang"}
         }
+        "Omsk Standard Time"{
+            001{"Asia/Omsk"}
+            RU{"Asia/Omsk"}
+        }
         "Pacific SA Standard Time"{
             001{"America/Santiago"}
             AQ{"Antarctica/Palmer"}
             CL{"America/Santiago"}
         }
+        "Pacific Standard Time (Mexico)"{
+            001{"America/Tijuana"}
+            MX{"America/Tijuana America/Santa_Isabel"}
+        }
         "Pacific Standard Time"{
             001{"America/Los_Angeles"}
             CA{"America/Vancouver America/Dawson America/Whitehorse"}
-            MX{"America/Tijuana America/Santa_Isabel"}
             US{"America/Los_Angeles"}
             ZZ{"PST8PDT"}
         }
@@ -460,14 +498,15 @@ windowsZones:table(nofallback){
         }
         "Russian Standard Time"{
             001{"Europe/Moscow"}
-            RU{"Europe/Moscow Europe/Kirov Europe/Simferopol Europe/Volgograd"}
+            RU{"Europe/Moscow Europe/Kirov Europe/Volgograd"}
+            UA{"Europe/Simferopol"}
         }
         "SA Eastern Standard Time"{
             001{"America/Cayenne"}
             AQ{"Antarctica/Rothera"}
             BR{
-                "America/Fortaleza America/Araguaina America/Belem America/Maceio Ame"
-                "rica/Recife America/Santarem"
+                "America/Fortaleza America/Belem America/Maceio America/Recife Americ"
+                "a/Santarem"
             }
             FK{"Atlantic/Stanley"}
             GF{"America/Cayenne"}
@@ -478,10 +517,8 @@ windowsZones:table(nofallback){
             001{"America/Bogota"}
             BR{"America/Rio_Branco America/Eirunepe"}
             CA{"America/Coral_Harbour"}
-            CL{"Pacific/Easter"}
             CO{"America/Bogota"}
             EC{"America/Guayaquil"}
-            HT{"America/Port-au-Prince"}
             JM{"America/Jamaica"}
             KY{"America/Cayman"}
             PA{"America/Panama"}
@@ -512,7 +549,6 @@ windowsZones:table(nofallback){
             MS{"America/Montserrat"}
             PR{"America/Puerto_Rico"}
             SX{"America/Lower_Princes"}
-            TC{"America/Grand_Turk"}
             TT{"America/Port_of_Spain"}
             VC{"America/St_Vincent"}
             VG{"America/Tortola"}
@@ -530,6 +566,10 @@ windowsZones:table(nofallback){
             VN{"Asia/Saigon"}
             ZZ{"Etc/GMT-7"}
         }
+        "Saint Pierre Standard Time"{
+            001{"America/Miquelon"}
+            PM{"America/Miquelon"}
+        }
         "Sakhalin Standard Time"{
             001{"Asia/Sakhalin"}
             RU{"Asia/Sakhalin"}
@@ -578,6 +618,10 @@ windowsZones:table(nofallback){
             001{"Australia/Hobart"}
             AU{"Australia/Hobart Australia/Currie"}
         }
+        "Tocantins Standard Time"{
+            001{"America/Araguaina"}
+            BR{"America/Araguaina"}
+        }
         "Tokyo Standard Time"{
             001{"Asia/Tokyo"}
             ID{"Asia/Jayapura"}
@@ -586,6 +630,10 @@ windowsZones:table(nofallback){
             TL{"Asia/Dili"}
             ZZ{"Etc/GMT-9"}
         }
+        "Tomsk Standard Time"{
+            001{"Asia/Tomsk"}
+            RU{"Asia/Tomsk"}
+        }
         "Tonga Standard Time"{
             001{"Pacific/Tongatapu"}
             KI{"Pacific/Enderbury"}
@@ -601,6 +649,10 @@ windowsZones:table(nofallback){
             001{"Europe/Istanbul"}
             TR{"Europe/Istanbul"}
         }
+        "Turks And Caicos Standard Time"{
+            001{"America/Grand_Turk"}
+            TC{"America/Grand_Turk"}
+        }
         "US Eastern Standard Time"{
             001{"America/Indianapolis"}
             US{"America/Indianapolis America/Indiana/Marengo America/Indiana/Vevay"}
@@ -633,6 +685,16 @@ windowsZones:table(nofallback){
             GS{"Atlantic/South_Georgia"}
             ZZ{"Etc/GMT+2"}
         }
+        "UTC-08"{
+            001{"Etc/GMT+8"}
+            PN{"Pacific/Pitcairn"}
+            ZZ{"Etc/GMT+8"}
+        }
+        "UTC-09"{
+            001{"Etc/GMT+9"}
+            PF{"Pacific/Gambier"}
+            ZZ{"Etc/GMT+9"}
+        }
         "UTC-11"{
             001{"Etc/GMT+11"}
             AS{"Pacific/Pago_Pago"}
@@ -693,6 +755,10 @@ windowsZones:table(nofallback){
             SM{"Europe/San_Marino"}
             VA{"Europe/Vatican"}
         }
+        "W. Mongolia Standard Time"{
+            001{"Asia/Hovd"}
+            MN{"Asia/Hovd"}
+        }
         "West Asia Standard Time"{
             001{"Asia/Tashkent"}
             AQ{"Antarctica/Mawson"}
@@ -704,6 +770,10 @@ windowsZones:table(nofallback){
             UZ{"Asia/Tashkent Asia/Samarkand"}
             ZZ{"Etc/GMT-5"}
         }
+        "West Bank Standard Time"{
+            001{"Asia/Hebron"}
+            PS{"Asia/Hebron Asia/Gaza"}
+        }
         "West Pacific Standard Time"{
             001{"Pacific/Port_Moresby"}
             AQ{"Antarctica/DumontDUrville"}