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

Change-Id: I8d1ff867915f8a86296f6605ce0b363916341583