[automerger skipped] Merge "Disable emoji compat initializer" into tm-qpr-dev...

[automerger skipped] Merge "Disable emoji compat initializer" into tm-qpr-dev am: 6408f974 -s ours am: 0b8f6dfd -s ours

am skip reason: Merged-In Ie5c6e8dbc69001478af78923b02bcca7777ed6b1 with SHA-1 8e3d5a10 is already in history

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



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