[automerger skipped] Merge Android U (ab/10368041) am: 0bab2c4350 -s ours

am skip reason: Merged-In I658ac79b7b48ad1ab4f36a56d61c16d891e1143d with SHA-1 765fdd19a8 is already in history

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

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