[automerger skipped] Merge "Merge Android 12L" am: 85ef644a8a -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: I9a987e3c8ba883d4471b9adc60181e659e6b2665