[automerger skipped] Merge Android 14 am: d9009471e1 -s ours am: 963461383e -s ours

am skip reason: Merged-In Id5ba8250839ac44b1515305431400328a7683744 with SHA-1 920bf3d02b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/s2-geometry-library-java/+/2777047

Change-Id: I8b12d30af7854f9fc1189b3364a72264643624b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>