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

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

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