[automerger skipped] Merge "Merge Android 12" am: 6b0c727173 -s ours

am skip reason: Merged-In Ib18020388a4609045e4e0138f8671c7ef1a5457b with SHA-1 63d977a809 is already in history

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

Change-Id: I8723edcd0cd09f6f4a1fcdf41ac41a3a3731fa91