[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 1c4d967ced -s ours

am skip reason: Merged-In I29866fe40317d20007758779ea6968ea9feb1925 with SHA-1 8873fe4020 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/noto-fonts/+/16844542

Change-Id: I76fea924a92e7a07cbce2cc84362de63c36424e3