Merge "Merge "Fix: insert mode crash when EmojiCompat is used" into udc-dev...

Merge "Merge "Fix: insert mode crash when EmojiCompat is used" into udc-dev am: 74ad406b am: ddd6d9a2 am: 710fef67" into udc-qpr-dev-plus-aosp am: 36365d7b

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



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