[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5e5f93d8c4 -s ours am: 0050cae03e -s ours

am skip reason: Change-Id I9aa34c701c165c4b37ff580a0c70668f8665e7f8 with SHA-1 e0eeaa6f66 is in history

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

Change-Id: I0d5101fcbc3ed01fb04dedf651795d200de9bc4e