[automerger skipped] Merge Android 12L am: 810578896e -s ours am: d4cc9ab2e5 -s ours am: 39f406f8a0 -s ours

am skip reason: Merged-In Iea002572895dfdb74f72b5d6fe7a1efbd4139cac with SHA-1 6454ff57c1 is already in history

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

Change-Id: I043e801e312f24aa88bc0d318b5a3f7989e51409