Merge "Update HarfBuzz to 3.1.1" am: 5546d81826 am: a882ada8dd

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

Change-Id: Iee60948c599c1176522ac27bc1140b9122651bd2