[automerger skipped] Merge 24Q4 into AOSP main am: 2cd885c047 -s ours am skip reason: Merged-In Ia863bf8e16da08a1c6b6860131e2bc2fb55dd622 with SHA-1 884a90eac4 is already in history Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/3413307 Change-Id: I9574316ad77ba8ba50bb58d37be22ab95bf31d35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>