Merge "Remove Android's default emoji characters from Noto Serif [DO NOT MERGE]" into nyc-mr1-dev am: 7d9f678d09
am: f751a98ae6

Change-Id: I8f980ba4338fbe2578ae32608891633d72a9b5e4