Merge "Fix IME callback not unregistered when IME is up during an IMM client...

Merge "Fix IME callback not unregistered when IME is up during an IMM client switch." into tm-dev am: 43572500 am: de9e6dd5 am: 51e7c953 am: 1db208a5

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



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