[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6454ff57c1 -s ours

am skip reason: Merged-In If2cc1c5bdb257a9c0af653fa7157cf781a90bf1d with SHA-1 6c752d8eca is already in history

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

Change-Id: I359693d3bf6c2ea3e4ce9e3ca6929524741e237b