[automerger skipped] DO NOT MERGE Ignore tztest#TestCanonicalID [Q CTS]. am: 2ba599c8b0 -s ours am: 5110f4823a -s ours am: df78a1adee -s ours am: 0173402352 -s ours am: 44c07f4c41 -s ours am: 27ef0175fb -s ours am: 5835e4db1d -s ours am: f1bc8c9dd5 -s ours am: 86f1b3a415 -s ours

am skip reason: subject contains skip directive

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

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