[automerger skipped] Merge "Fix update failure if font family was installed...

[automerger skipped] Merge "Fix update failure if font family was installed and upgraded to 14" into 24D1-dev am: 6d5685c8 -s ours

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

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



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