Merge "Fix IME snapshot missing to remove by 2 consecutive creation calls" into tm-dev am: 841a55dc am: 35d25df7

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



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