[automerger skipped] DO NOT MERGE Ignore TimeZoneTest#TestCanonicalID [O-MR1 CTS]. am: 671bae87b1 -s ours am: c4733683e9 -s ours am: 0ba02b9d44 -s ours am: 185f697f0e -s ours am: 93b38ad0bf -s ours am: 2554fd6418 -s ours am: 603ac2afce -s ours am: 745fb27e13 -s ours

am skip reason: subject contains skip directive

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

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