Merge "Update HarfBuzz to 3.1.1" am: 5546d81826

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

Change-Id: I98631b7462f329d36a86a925b711d41c9ef8a705