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: I6be02538591162f66b1732170fb87a50896d946f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>