[automerger skipped] Merge Android R am: 571649323d -s ours am: 73619f3a77 -s ours am: a9313df7f6 -s ours am: 4dd96fb41e -s ours

am skip reason: Change-Id Id41e3ef8bd7d4487a754f33d25ff00e69633adc9 with SHA-1 737a78d493 is in history

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

Change-Id: I11be26e5e4879bbdaf321c1d91d01b25f9574829