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

Change-Id: I80a7f3087fe15f9081ef4f74cd36dbc29a70dcac