[jdk11u-dev] RFR: 8274864: Remove Amman/Cairo hacks in ZoneInfoFile

[Andrew John Hughes]

Hi all,

This pull request contains a backport of commit [ec199072](https://github.com/openjdk/jdk/commit/ec199072c5867624d66840238cc8828e16ae8da7) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.

The commit being backported was authored by Naoto Sato on 8 Oct 2021 and was reviewed by Iris Clark and Joe Wang.

It is a pre-requisite for backporting the latest tzdata update, [JDK-8305113](https://bugs.openjdk.org/browse/JDK-8305113) and has already been backported to Oracle's 11.0.20.

Backport is clean. Tests in `java/util/TimeZone`, `java/time/test`, `sun/util/calendar`, `sun/util/resources` and `sun/text/resources` show no regressions (I see `java/time/test/java/time/format/TestUTCParse.java` failing both patched and unpatched)

Thanks!

-------------

Commit messages:
 - Backport ec199072c5867624d66840238cc8828e16ae8da7

Changes: https://git.openjdk.org/jdk11u-dev/pull/1828/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1828&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8274864
  Stats: 29 lines in 1 file changed: 0 ins; 29 del; 0 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1828.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/1828/head:pull/1828

PR: https://git.openjdk.org/jdk11u-dev/pull/1828