Merge "Fix: EditText crash when insert emoji in insert mode" into udc-dev am: 4f1352fd

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



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