[automerger skipped] Merge "Merge Android R" am: c65e16db60
-s ours am: 4908f9ae18
-s ours am: e2a6086b5c
-s ours am: 029fc7ffa9
-s ours am: b7bacbff96
-s ours
am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755ccae9
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510
Change-Id: I80987dd2969a339472f121577cca18646639599a
main
commit
6647754cef