[automerger skipped] DO NOT MERGE Ignore tztest#TestCanonicalID [O-MR1 CTS]. am: d256b16cea -s ours am: 3789702283 -s ours am: 197502b3a1 -s ours am: 037af050c1 -s ours am: 9911b43968 -s ours am: 56f8b30dcb -s ours am: a255774093 -s ours am: e871e9d663 -s ours am: b61a4bb4a1 -s ours am: 185bac09d0 -s ours am: 76126c360a -s ours

am skip reason: subject contains skip directive

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

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