[automerger skipped] Merge "Update ImageGenerator to match the latest font...

[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930 am: 4de32b2f am: 9dc8ca5a -s ours am: 53654125 -s ours

am skip reason: Change-Id Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e8283 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1607136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8640e934636a0139199ab37240d626112eebe8f4