[automerger skipped] Merge Android 12 am: 344cffe81a -s ours am: 81d644e2a5 -s ours am: dab78214fa -s ours am: 7debef81f6 -s ours am: f4d7a1014c -s ours

am skip reason: Merged-In Ie0fa1e79a4df58e3f56a9633fc1bfa93b1d2d1b3 with SHA-1 29d7656fb1 is already in history

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

Change-Id: I52455d7077976439d1333f26eb1217a33d1c2e39