DO NOT MERGE Update Android TZDB from 2020f to 2021a. [R]

Update Android TZDB from 2020f to 2021a. [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 2021a release notes:
  Briefly:
    South Sudan changes from +03 to +02 on 2021-02-01.

  Changes to future timestamps
    South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
    (Thanks to Steffen Thorsen.)

Bug: 178780062
Bug: 183389264
Test: CtsLibcoreTestCases
Test: CtsLibcoreOjTestCases
Test: CtsIcuTestCases
Test: CtsBionicTestCases
Test: CtsTextTestCases
Test: Verified version by running 'adb shell dumpsys runtime'
Test: Checked South Sudan in Setting -> Date & Time before
and after 2021a on CF instance.

Merged-In: I8d2b2f09cf56441ef708da652003ab5a85cf18f6
Merged-In: I659a3413c3c03a981a53d7ec69e7f32063871a59
Change-Id: I659a3413c3c03a981a53d7ec69e7f32063871a59

19 files changed, 20 insertions, 20 deletions

diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt
index 57eeebe5..93a02f5e 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:"2020f"
+ianaVersion:"2021a"
 
 # countries:
 #
@@ -2948,7 +2948,7 @@ countries:<
 countries:<
   isoCode:"ss"
   timeZoneMappings:<
-    utcOffset:"3:00"
+    utcOffset:"2:00"
     id:"Africa/Juba"
   >
 >
diff --git a/input_data/iana/tzdata2020f.tar.gz b/input_data/iana/tzdata2020f.tar.gz
deleted file mode 100644
index 9bea3b99..00000000
--- a/input_data/iana/tzdata2020f.tar.gz
+++ /dev/null
diff --git a/input_data/iana/tzdata2020f.tar.gz.asc b/input_data/iana/tzdata2020f.tar.gz.asc
deleted file mode 100644
index ba73f797..00000000
--- a/input_data/iana/tzdata2020f.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAl/q5ukACgkQ7ZfpDmKq
-fjQ8ug//WH7DpYFvSYMKpSj6gG0m5lK0JXcs062EKGQNsVoUjSVImu3VPbpUS9tu
-cO3NCUmeqTmwhUOuZQN2qGAT2KyNhcLTlza8xuRQm/tJ7SYpArseY9rudQtkjbCi
-uWELQi5+a6CA/PBBRJzDJwQPTf4wDZr24vDd29tKqBho5T5cisudXHhqh1Bm0Bfr
-NPyPsS6+oLJofIVsU0I5V+fbnU98ny5I1r/OyVIJgAlvEcb0kMDr0fBfu1dNvJI9
-Tyl3kvdLSMCgf/lRXEFYJpI0RuUeIAsOvHaSwSCHKGc7FHzgDiK1U5D/4z5Ipo02
-0AQKkLFkEbzwou/5KtX2Q3+yba1AGu64C7elu+aKepUNGhkzAaJrl2xNNM25Sdn4
-1WvxOt43GTIze0cr9UHm942sU5UxH0ahv4h9pEbqJ44UVzBhuDDqcMXYJEWhdhMf
-6dgRA7SJThuX7tN758to9Ze9XyXMdzAPdJKs/wyLrRGyDq0dXlRTVPL4Nk9ZqRQh
-FYJlOhM2TGSg7VsNgn8gneODaaQJpJ7jVSIwicQtWES2K2oblrFz4LSeXm39xZDc
-0JRNh/fSeRygCGrjD7CLqq88UGTxhEuZbEXKXSPMLC+7j7JF/CmCVj8HjNw8M3Cy
-uk/Tfamala66AGltxPwKchTPBJH8F4tZy+4krfYXByoIX5h+Ta4=
-=Fk0g
------END PGP SIGNATURE-----
diff --git a/input_data/iana/tzdata2021a.tar.gz b/input_data/iana/tzdata2021a.tar.gz
new file mode 100644
index 00000000..6cfd2e32
--- /dev/null
+++ b/input_data/iana/tzdata2021a.tar.gz
diff --git a/input_data/iana/tzdata2021a.tar.gz.asc b/input_data/iana/tzdata2021a.tar.gz.asc
new file mode 100644
index 00000000..79229476
--- /dev/null
+++ b/input_data/iana/tzdata2021a.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmANxdIACgkQ7ZfpDmKq
+fjTnYRAAnozc58/XHxdZ92os3TIzGZHDt4jWZt7zeSlzag7C9r0pvq2u0K0AZVPG
+yGMUpNlFm2fcbks65En8+wRVZ/5AJeEkUA4V2DDMlf5yDtiXZyt42YTu0UL/saZ3
+wHEZIPySeZWKdUILp9BTD9ZDmY2VbIceL1PGMfs00Ti98UgmsNG8yJPMD2E86T3H
+dcsx7kTYFou9KYuvm3GDlxrQO7X/sTVVEnWJF7Z8rLQz4wjPnYn6Lspoav+N0HNR
+ycRXSADS3c2kjlaeRjjYVKaekJ3oIXvWgfXcYb1CcB59bACDi4HOMvd8kMU/PV5R
+p7lkZpSvSNNy/5j5MJDV79YVBwas5++yjv8bQZPkDnS/1YvW9I8ca4YYeTGEA1/G
+89sysUlUEYzuojs+oApgqFFAwl+Eo0y5MLyOuRxcXgWw6+eTW6oHHaUXLDFq9jwR
+d0biMlHIFZNyKHZ72dUbSLo8FalHspHdRYBCppwU8cCprJlPc43zuljru86jRYuW
+jr228IpKq75ngtXbOHexVrnJejCp/NuV3rcfP3FjC2C3HC2Ao95FO9xT0ZlcTpXq
++wu2wZ8csf1RO/hzyOHtcpuFZBRL5a4ZQNvqydFgMgfx2oZcSIAz3GmA8qt5BjHQ
+C+JwBd00A4JvOigUMvprSSvu3OEOv2kCLgAQSJPOSGWbkrr0s08=
+=5dc0
+-----END PGP SIGNATURE-----
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml
index 78664cae..c63e4c02 100644
--- a/output_data/android/tzlookup.xml
+++ b/output_data/android/tzlookup.xml
@@ -2,7 +2,7 @@
 
  **** Autogenerated file - DO NOT EDIT ****
 
---><timezones ianaversion="2020f">
+--><timezones ianaversion="2021a">
  <countryzones>
   <country code="ad" default="Europe/Andorra" everutc="n">
    <id>Europe/Andorra</id>
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip
index 94417426..9e5a490c 100644
--- a/output_data/distro/distro.zip
+++ b/output_data/distro/distro.zip
diff --git a/output_data/iana/tzdata b/output_data/iana/tzdata
index f0948baa..5ec6448c 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 eb590a49..846c3942 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 36055ff3..60b5ae26 100644
--- a/output_data/version/tz_version
+++ b/output_data/version/tz_version
@@ -1 +1 @@
-004.001|2020f|001
\ No newline at end of file
+004.001|2021a|001
\ No newline at end of file
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip
index c2c0939b..a58050aa 100644
--- a/testing/data/test1/output_data/distro/distro.zip
+++ b/testing/data/test1/output_data/distro/distro.zip
diff --git a/testing/data/test1/output_data/iana/tzdata b/testing/data/test1/output_data/iana/tzdata
index 982672fe..1b8d8179 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 7eaa1261..d50749d8 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/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip
index 5adba8cc..043d488c 100644
--- a/testing/data/test2/output_data/distro/distro.zip
+++ b/testing/data/test2/output_data/distro/distro.zip
diff --git a/testing/data/test2/output_data/iana/tzdata b/testing/data/test2/output_data/iana/tzdata
index 41d6ec63..47d5f0a3 100644
--- a/testing/data/test2/output_data/iana/tzdata
+++ b/testing/data/test2/output_data/iana/tzdata
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 92c45715..7a3ed9e3 100644
--- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat
diff --git a/testing/data/test3/output_data/distro/distro.zip b/testing/data/test3/output_data/distro/distro.zip
index c37bec0c..c5ef0d7b 100644
--- a/testing/data/test3/output_data/distro/distro.zip
+++ b/testing/data/test3/output_data/distro/distro.zip
diff --git a/testing/data/test3/output_data/iana/tzdata b/testing/data/test3/output_data/iana/tzdata
index 982672fe..1b8d8179 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 a72a8c92..c186a3b0 100644
--- a/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat
+++ b/testing/data/test3/output_data/icu_overlay/icu_tzdata.dat