RESTRICT AUTOMERGE Update Android from 2020a to 2020b [R]

Update Android from 2020a to 2020b [R]

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 TZDB 2020b release description:

   Briefly:
     Revised predictions for Morocco's changes starting in 2023.
     Canada's Yukon changes to -07 on 2020-11-01, not 2020-03-08.
     Macquarie Island has stayed in sync with Tasmania since 2011.
     Casey, Antarctica is at +08 in winter and +11 in summer.
     zic no longer supports -y, nor the TYPE field of Rules.

   Changes to future timestamps

     Morocco's spring-forward after Ramadan is now predicted to occur
     no sooner than two days after Ramadan, instead of one day.
     (Thanks to Milamber.)  The first altered prediction is for 2023,
     now predicted to spring-forward on April 30 instead of April 23.

   Changes to past and future timestamps

    Casey Station, Antarctica has been using +08 in winter and +11 in
    summer since 2018.  The most recent transition from +08 to +11 was
    2020-10-04 00:01.  Also, Macquarie Island has been staying in
    sync with Tasmania since 2011.  (Thanks to Steffen Thorsen.)

   Changes to past and future time zone abbreviations and DST flags

     Canada's Yukon, represented by America/Whitehorse and
     America/Dawson, changes its time zone rules from -08/-07 to
     permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it.
     This change affects only the time zone abbreviation (MST vs PDT)
     and daylight saving flag for the period between the two dates.
     (Thanks to Andrew G. Smith.)

   Changes to past timestamps

     Correct several transitions for Hungary for 1918/1983.
     For example, the 1983-09-25 fall-back was at 01:00, not 03:00.
     (Thanks to Géza Nyáry.)  Also, the 1890 transition to standard
     time was on 11-01, not 10-01 (thanks to Michael Deckers).

     The 1891 French transition was on March 16, not March 15.  The
     1911-03-11 French transition was at midnight, not a minute later.
     Monaco's transitions were on 1892-06-01 and 1911-03-29, not
     1891-03-15 and 1911-03-11.  (Thanks to Michael Deckers.)

Bug: 170712024
Test: Ran CtsLibcoreTestCases, CtsLibcoreOjTestCases, CtsBionicTestCases
Test: CtsIcuTestCases
Change-Id: Ia0b3d3a2de87e44ee03f6bd264f6120a63f9dfc4
Merged-In: Ia0b3d3a2de87e44ee03f6bd264f6120a63f9dfc4
(cherry picked from commit 633367f239e20d5eb52f6a33e4e937012146d554)
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 25a0376..9d67ac3 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:"2020a"
+ianaVersion:"2020b"
 
 # countries:
 #
@@ -204,7 +204,7 @@
   >
 
   timeZoneMappings:<
-    utcOffset:"08:00"
+    utcOffset:"11:00"
     id:"Antarctica/Casey"
   >
 
@@ -400,7 +400,7 @@
   >
 
   timeZoneMappings:<
-    utcOffset:"11:00"
+    utcOffset:"10:00"
     id:"Antarctica/Macquarie"
     # Unknown
     priority:1
diff --git a/input_data/iana/tzdata2020a.tar.gz b/input_data/iana/tzdata2020a.tar.gz
deleted file mode 100644
index 15b39fb..0000000
--- a/input_data/iana/tzdata2020a.tar.gz
+++ /dev/null
Binary files differ
diff --git a/input_data/iana/tzdata2020a.tar.gz.asc b/input_data/iana/tzdata2020a.tar.gz.asc
deleted file mode 100644
index 222ad46..0000000
--- a/input_data/iana/tzdata2020a.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl6iH9MACgkQ7ZfpDmKq
-fjTb6g/+P/l6Nev5Zv8mUktnT6eNKohtgpNRyHd8nYV92wmTiDSzAArFy7oi5CVV
-/jMv8sbV1ssq/5rQ6HUQuMDPgEIO405gxmqRWMhE6UwUbRxxa+/HKGUJH0AHY6Dh
-1UhVD7QA6fDovs84ip/WgTEZYcYApLr2A3IfC0rDqDo42DiSnErFQDvqRMJQkQS1
-p2Pv7YtW/2NZ52wkfq75klSsjlXzlz6CzM5P3/YU/Hylj42sQdbdtbUAyQug3YpD
-QQ2PiZoP92iiGrcwkKXa5xvXJ6jEZCXqi7HbJKt8OW+XpZ/ZYbTZRq+JvMbTqkOL
-+XvVufo/pVASgv2V0ynzJu/XRiFUeJaecmEg6QiAiJ74UMTXSGFnK//R32M9dp29
-B4p2X2jmW9qjCwjbjQXl1Yl5ddlSyvBk2Lk4s1repQ2t7kphZx2C8P2WyQYGeP7H
-nZDucfmWK4OSh8cINexBE8xyagmv1T8mC4qEQbVPva6JysaodNBcf9WkKMCgituP
-tbPsVekSmG1GyN2ixPtpY86Fzjr60mEg1UKqHZIagRmH4kjUwd1gINCJgONaZZxo
-c1VfBD8ZORBZfG27+V5ISotKrK2UrKtcrSUEU1CC/ibOm1sSPfg0d5uxUVvg4E8+
-okdszbMnQ1i0eVKW+L+jY5XOO8kmSLp4YcnrqXDyZabxyWIGMt4=
-=7U2J
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2020b.tar.gz b/input_data/iana/tzdata2020b.tar.gz
new file mode 100644
index 0000000..874e97e
--- /dev/null
+++ b/input_data/iana/tzdata2020b.tar.gz
Binary files differ
diff --git a/input_data/iana/tzdata2020b.tar.gz.asc b/input_data/iana/tzdata2020b.tar.gz.asc
new file mode 100644
index 0000000..062a7a1
--- /dev/null
+++ b/input_data/iana/tzdata2020b.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl99HToACgkQ7ZfpDmKq
+fjT5CQ//W6kd+vP2tAdMbmJnH35sCd0NoAFBC1j00Blg+I6s507w5VjOTjvrvjlE
+0RB2G67vNKTOBybPyk7l8cKq+5Xw5IE1xqwqfpN3+DH2BWt4P0AllcBBRRky9iXS
+oO+z4F51rud9+CD2vbhtx0eT9MWYVfzrncNUHIYm7sDx01vtCp3h5u9ryB2sfHT/
+iMKrB5ytFqWkNXZtMiRDj3LZF0y2+JM1/8lfZB/hyxx1Bbvcm07dQvBBz8ljT6KD
+/BJFsgwvvlpxOZ1P0fFb7BnMPD5v/fB5r/0i/c4ErIY8JPtxDY6ctGdtbC/0H7Xf
+kjve+Fue08CBg4tXEW75SvWBP8Li1XylSNohIEtnclXj9B1nwu0WArZtATIqhpxl
+T77J85JkVQoAi5Wh38Msy9QWb54FRoK8/c1drfwb/iMkRYt57mU5zuY9JJvx7mAm
+S3eVqU3/tX4Ue7gQ1hjW3m9abmS1Hmq4aQ8r1uS0t2cIjbrMY2zaRwYzb2UknT2w
+VVr5O5bWoPHSFDeqUU7NdGHQzJX+NLvpTlcvJHXONSu7CksC09uhzBVJ2LbkjQS1
+zD+jSCTgXZonegcF0/UsfMrxmrizDFVcvwDXnDa4TcRPVSevtdWvM+EXr3Dto0N/
+wlI4v2nZE2ZFB3+7iGxc0WwiHUdsVbQVD+fCTIBl4Uh4ViTAsXI=
+=/O2G
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 1820102..55f94bd 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2020a">
+--><timezones ianaversion="2020b">
  <countryzones>
   <country code="ad" default="Europe/Andorra" everutc="n">
    <id>Europe/Andorra</id>
@@ -67,7 +67,7 @@
    <id notafter="1193500800000">Australia/Hobart</id>
    <id notafter="37728000000">Australia/Currie</id>
    <id notafter="762883200000">Australia/Lindeman</id>
-   <id>Antarctica/Macquarie</id>
+   <id notafter="1286035200000">Antarctica/Macquarie</id>
    <id>Australia/Lord_Howe</id>
    <id>Australia/Adelaide</id>
    <id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
    <id notafter="309945600000">America/Yellowknife</id>
    <id notafter="294228000000">America/Inuvik</id>
    <id>America/Whitehorse</id>
-   <id notafter="1583661600000">America/Dawson_Creek</id>
+   <id notafter="1604214000000">America/Dawson_Creek</id>
    <id notafter="84013200000">America/Creston</id>
    <id notafter="1425808800000">America/Fort_Nelson</id>
    <id notafter="120646800000">America/Dawson</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 95a3958..6fd662a 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
Binary files differ
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index 301e264..bd4c212 100644
--- a/output_data/iana/tzdata
+++ b/output_data/iana/tzdata
Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat
index 89facfe..f765a0c 100644
--- a/output_data/icu_overlay/icu_tzdata.dat
+++ b/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/output_data/version/tz_version b/output_data/version/tz_version
index 530048f..f192f27 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2020a|001
\ No newline at end of file
+004.001|2020b|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 9d3ae8d..951c87b 100644
--- a/testing/data/test1/output_data/android/tzlookup.xml
+++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
    <id notafter="1193500800000">Australia/Hobart</id>
    <id notafter="37728000000">Australia/Currie</id>
    <id notafter="762883200000">Australia/Lindeman</id>
-   <id>Antarctica/Macquarie</id>
+   <id notafter="1286035200000">Antarctica/Macquarie</id>
    <id>Australia/Lord_Howe</id>
    <id>Australia/Adelaide</id>
    <id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
    <id notafter="309945600000">America/Yellowknife</id>
    <id notafter="294228000000">America/Inuvik</id>
    <id>America/Whitehorse</id>
-   <id notafter="1583661600000">America/Dawson_Creek</id>
+   <id notafter="1604214000000">America/Dawson_Creek</id>
    <id notafter="84013200000">America/Creston</id>
    <id notafter="1425808800000">America/Fort_Nelson</id>
    <id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index c607a8a..14f34d8 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index c5a28a4..7180b9b 100644
--- a/testing/data/test1/output_data/iana/tzdata
+++ b/testing/data/test1/output_data/iana/tzdata
Binary files differ
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 8ed9429..367c28a 100644
--- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml
index 5f86aad..841f35b 100644
--- a/testing/data/test2/output_data/android/tzlookup.xml
+++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
    <id notafter="1193500800000">Australia/Hobart</id>
    <id notafter="37728000000">Australia/Currie</id>
    <id notafter="762883200000">Australia/Lindeman</id>
-   <id>Antarctica/Macquarie</id>
+   <id notafter="1286035200000">Antarctica/Macquarie</id>
    <id>Australia/Lord_Howe</id>
    <id>Australia/Adelaide</id>
    <id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
    <id notafter="309945600000">America/Yellowknife</id>
    <id notafter="294228000000">America/Inuvik</id>
    <id>America/Whitehorse</id>
-   <id notafter="1583661600000">America/Dawson_Creek</id>
+   <id notafter="1604214000000">America/Dawson_Creek</id>
    <id notafter="84013200000">America/Creston</id>
    <id notafter="1425808800000">America/Fort_Nelson</id>
    <id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 56afe3b..767c529 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index c2d09f8..9e128c2 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
index 533792d..54822e7 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
Binary files differ
diff --git a/testing/data/test3/output_data/android/tzlookup.xml b/testing/data/test3/output_data/android/tzlookup.xml
index 9d3ae8d..951c87b 100644
--- a/testing/data/test3/output_data/android/tzlookup.xml
+++ b/testing/data/test3/output_data/android/tzlookup.xml
@@ -67,7 +67,7 @@
    <id notafter="1193500800000">Australia/Hobart</id>
    <id notafter="37728000000">Australia/Currie</id>
    <id notafter="762883200000">Australia/Lindeman</id>
-   <id>Antarctica/Macquarie</id>
+   <id notafter="1286035200000">Antarctica/Macquarie</id>
    <id>Australia/Lord_Howe</id>
    <id>Australia/Adelaide</id>
    <id notafter="796149000000">Australia/Broken_Hill</id>
@@ -184,7 +184,7 @@
    <id notafter="309945600000">America/Yellowknife</id>
    <id notafter="294228000000">America/Inuvik</id>
    <id>America/Whitehorse</id>
-   <id notafter="1583661600000">America/Dawson_Creek</id>
+   <id notafter="1604214000000">America/Dawson_Creek</id>
    <id notafter="84013200000">America/Creston</id>
    <id notafter="1425808800000">America/Fort_Nelson</id>
    <id notafter="120646800000">America/Dawson</id>
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index e9244b9..4b6c8f1 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
Binary files differ
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index c5a28a4..7180b9b 100644
--- a/testing/data/test3/output_data/iana/tzdata
+++ b/testing/data/test3/output_data/iana/tzdata
Binary files differ
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 4506871..063cb1e 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
Binary files differ