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

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

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



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