[automerger skipped] Skip ab/6749736 in stage. am: 58ba29796a -s ours am: 1c3e1ba2b6 -s ours

am skip reason: Change-Id I471a89d14068a95598dd4d8569f7101f06150da4 with SHA-1 95908c5487 is in history

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

Change-Id: I54d375301e7376e5f6b13910a966125f41f5654c