[automerger skipped] Disable emoji compat initializer am: 8e3d5a1096 -s ours am: 3ed1c21fe6 -s ours
am skip reason: Merged-In Ie5c6e8dbc69001478af78923b02bcca7777ed6b1 with SHA-1 414720299e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994099
Change-Id: I55e5c15e8a53158225c97c86dfc46eb3f7a5a850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: