Merge "Fix font update failure" into main am: 093c0d8914

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

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