[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s ours am: b27f13c337 -s ours

am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history

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

Change-Id: Icbb4972f1358f215d77560d8873d0ae4b6a4a2ad