[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755ccae9 -s ours am: ded6b22fdc -s ours

am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cfa3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255

Change-Id: I61c68204b62b3e6dd93e6600900c2a5c1520c857