[automerger skipped] Merge Android 12L am: 9fc19c52b1 -s ours am: 07cbf5d668 -s ours am: a6f19a7474 -s ours am: 93dee14be8 -s ours

am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316

Change-Id: I1146b65600c6db92720de58add9762212810a3fc