Merge "Sync emojicompat changes to aosp-master"