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

am skip reason: Merged-In Ie1e2f9ee85625216be6b2cb0781df34faec97673 with SHA-1 0a4e828357 is already in history

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

Change-Id: Id6374a307d09e14ed49be1b69900c259c96f2e9f