[automerger skipped] Merge Android 12L am: 810578896e -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: Ic5c820036065498cfbeaea02232a21831616e3c5