Merge "Update Emoji.java for emoji 11" into pi-dev
am: 5ee0f5c1d7

Change-Id: Ide0fbd74e531f401b6e3a22b0cb84fb083486994