Merge "Re-enable disabled emoji tests [DO NOT MERGE]" into nyc-mr1-dev am: eab8a12845
am: c178f807c4

Change-Id: I5ece66f93a63d4334b336ac37c30921743eb5d74