Merge "EmojiCompat 12.1"
am: f13062d6d7

Change-Id: I57e8f34b5a6acdc5b207c20d191bb1aea7c42a08