Merge "Update utility class Emoji.java for Emoji 11"