Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am: e7ab3e1650 am: ddc50bb7d9
am: 7ed925511b
Change-Id: Ic3b24969885a3df3e153edf15788d3b32c3cea48
This commit is contained in: