[automerger skipped] DO NOT MERGE Ignore tztest#TestCanonicalID [O-MR1 CTS]. am: d256b16cea -s ours am: 442e3f012c -s ours am: 4fc00d7e60 -s ours am: a896504cce -s ours am: f40bfb15c0 -s ours

am skip reason: subject contains skip directive

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

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