Merge "Override bidi property of new emojis" into oc-dev
am: 21a5edcc24

Change-Id: Ie37451b8234f1e5c06bb20f1c26e8f832006f3e3