[automerger skipped] Merge Android 12L am: 9fc19c52b1 -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: I0527c7f4c01fd4e51557401d987a139d7067308e