[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: fcee546744 -s ours am: de8c2397f1 -s ours

am skip reason: Change-Id Ia0b1c53b5b58c067e86805a34e358081831dc792 with SHA-1 b31d168b7e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I547e19057d0d784a1c57d929ac41135e3cbc3a1d