[automerger skipped] DO NOT MERGE Ignore TimeZoneTest#TestCanonicalID [P CTS]. am: 5f8e4d5ff7 -s ours am: 9254d301fe -s ours am: ee12affbaa -s ours am: 56f90e4e60 -s ours am: 7d5dcfd429 -s ours am: e8e0e9d048 -s ours am: cb8b57d194 -s ours am: 3f0b938ff0 -s ours

am skip reason: subject contains skip directive

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

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