[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 55b3b0dc94 -s ours am: 266ccb4db5 -s ours am: 7cbd201dac -s ours am: 9b23979965 -s ours

am skip reason: Merged-In I678f9d98ba4550cfa1c16c98f57d216ff31ad99a with SHA-1 67e6243a2f is already in history

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

Change-Id: Iffa1e4c44af21c2873b5eaeeec30f0601e2dd11b