Merge "Merge "Disable emoji compat initializer" into udc-dev am: 29b802e8" into udc-dev-plus-aosp am: ce668539

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



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