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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia477705d115b4aa8dc710e41da0d4efcf74a39d9