[automerger skipped] Merge "Merge Android 12L" am: 05e8cf4309 -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: I28bb201fbe5b1d6cfcb614c50f647153a22628f5