[automerger skipped] Merge "Deprecate fonts.xml and add hidden...

[automerger skipped] Merge "Deprecate fonts.xml and add hidden font_fallback.xml" into main am: a6fac5d6 am: 38d368a9 am: f6aa44a3 am: 81808d8d am: aa1fbff6 -s ours

am skip reason: Merged-In I556b5fffb0c78f0c6150b472fd240b9a546de93f with SHA-1 c235a386 is already in history

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



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