[automerger skipped] Merge "Merge Android 13 QPR2" am: 504a8e90b9 -s ours am: b8833af648 -s ours am: 6c152889ac -s ours am: 675d4ab0fa -s ours

am skip reason: Merged-In I80f56f9865672006130c1f29ada35321e02232aa with SHA-1 d0d25b4d86 is already in history

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

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