Merge "Fix: insert mode crash when EmojiCompat is used" into udc-dev am: 74ad406b am: ddd6d9a2

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



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