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

Change-Id: I76ef10ab4611e0fc2327b8c9ec0c4a0ee7da6fcd