[automerger skipped] DO NOT MERGE Ignore TimeZoneTest#TestCanonicalID [O-MR1 CTS]. am: 671bae87b1 -s ours am: b5ddab3dc8 -s ours am: 770bacb308 -s ours am: 641285c7f1 -s ours am: e44bee4b70 -s ours am: 51a92fbaf9 -s ours am: 8992a0f95e -s ours am: 421a855a1f -s ours am: e9d830372d -s ours

am skip reason: subject contains skip directive

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

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