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: 4507970c

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



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