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 am: 95a0aaee

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



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