[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: 18a8fa8c -s ours am: ea0086ff -s ours

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

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



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