[automerger skipped] Merge "Merge Android R" am: c65e16db60 -s ours am: 4908f9ae18 -s ours am: e2a6086b5c -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: I1362f20646ccdb11a15df1eb73947764eba57928