[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 737a78d493 -s ours am: 2884fb8e18 -s ours am: 9202ba7275 -s ours

am skip reason: Change-Id Ib9a00cd1def83755029fd97eefafd791f38dc5bc with SHA-1 cad8a32807 is in history

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

Change-Id: Idf641d504ea1d975620609754f9f7e018d809b98