[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: b31d168b7e -s ours am: 7be569bc67 -s ours

am skip reason: Change-Id I7509b5d196ca241b2d80fcd801b7af94b749fb70 with SHA-1 cc1e8f5100 is in history

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

Change-Id: I5c52978ca978d46cacf3ca05850cb3fad08ae0fa