[automerger skipped] Merge Android 12 am: 753edea69c -s ours am: 9f5396de9b -s ours

am skip reason: Merged-In I74c4c80e03bfa41b9e8cd13f3cfcbe9ac6efdd50 with SHA-1 55b3b0dc94 is already in history

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

Change-Id: I2db263c1ebd7868a58f1599f9681085e70fef27c