[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 72877cba9a -s ours am: bb95d7895f -s ours

am skip reason: Merged-In I6443205361aaff30f2d03bb002535a7890afabb4 with SHA-1 1a4b894211 is already in history

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

Change-Id: I54c86dd069ff6e1381a05d6106bcbb92cd68f692