[automerger skipped] Merge "Fix font update failure" into main am: 093c0d89...

[automerger skipped] Merge "Fix font update failure" into main am: 093c0d89 am: 901ec314 -s ours

am skip reason: Merged-In I0373a2e66b7a6a51168094772afb36d8905b6979 with SHA-1 c273a7e8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3024423



Change-Id: If180f594452de11bc2ef489d5d031f113008c388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>