[automerger skipped] Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0 am: 61104a15f5 -s ours
am skip reason: Merged-In Ie807e31abb407f5b58665d4d2941bc75186d5c42 with SHA-1 ebdae2e9b7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179
Change-Id: I76ec8fed0ecdaece7cbd2303ccc5a4258452d021
This commit is contained in: