[automerger skipped] Merge "Update fontchain_linter for emoji 11" into pi-dev am: 485a197ab0
am: edcdab22c4  -s ours

Change-Id: Ia840dd8b7aa590c8838549cd05da14a474543267