Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c6

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



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