Merge "Merge "Disable emoji compat initializer" into udc-dev am: 29b802e8...

Merge "Merge "Disable emoji compat initializer" into udc-dev am: 29b802e8 am: 8c806bd4 am: 9d142878" into udc-qpr-dev-plus-aosp am: f039e572

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



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