[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 2953191e6f -s ours

am skip reason: Merged-In I80f56f9865672006130c1f29ada35321e02232aa with SHA-1 d0d25b4d86 is already in history

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

Change-Id: Ie3256636740afd471fc21ddac7aa17eeb6772510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>