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

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

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



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