[automerger skipped] Merge "Update NotoSerifHentaigana entry in font...

[automerger skipped] Merge "Update NotoSerifHentaigana entry in font configuration XML" into main am: 31753ee5 am: 62ddb402 -s ours

am skip reason: Merged-In I22bf47a913f3b25b3f095e4ab276af79e51a4a76 with SHA-1 76c68190 is already in history

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



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