Merge "Merge "Fix IME callback not being re-registered on screen off / on."...

Merge "Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c6 am: a4144a69" into tm-d1-dev-plus-aosp am: 40e4bf09

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689



Change-Id: I13bc2e32018553547a10c459ac5d1249cd35b6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>