[automerger skipped] Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc am: 4de32b2fb2 am: 9dc8ca5a41 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38368afb55f0b0656ebd78d3a4f5c861461cb1d9