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

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

Change-Id: I8ea089bfde255e42f4e7ac9fe9a3cf640973e2be