Merge "Check defaults for Android default-emoji characters [DO NOT MERGE]" into nyc-mr1-dev am: 01bb406426
am: d78d0c86da

Change-Id: Ibaec98c1a6e34170c5b6d6749efec1a65c5c4d54