[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 59c0e24f7d -s ours am: e3d05eb133 -s ours am: 6ab231bd47 -s ours

am skip reason: Merged-In Iba80e9efc395ee1f2ea9f0a281bf4eef0c520a00 with SHA-1 ea886e460b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/15571827

Change-Id: I96d7fbc4fff52d6fdf693b58fae1b8d1c715709f