Merge "Android patch: read ICU time zone files from versioned path only." into main am: c27559bd41

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/3117455

Change-Id: I506752aca53504df322239d50c66a9f227f70911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>