[automerger skipped] Merge "Check signature of updated font during boot" into...

[automerger skipped] Merge "Check signature of updated font during boot" into stage-aosp-master am: 52f9970e -s ours am: 75461cfa -s ours

am skip reason: Merged-In Ia4a6720b863163be523b845b883915185cee656c with SHA-1 e9b53c20 is already in history

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



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