[automerger skipped] Allow the S2 java lib to be used in platform code am: bc9a7bb0d2 am: d62bc5b681 -s ours

am skip reason: Merged-In I2608f134f1232a04fbfd094ce47c5747b88336fa with SHA-1 eab1a33feb is already in history

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

Change-Id: I8a62f6fe6095be792cfa0f8dd28e4373eaa520e3
Signed-off-by: Automerger Merge Worker <[email protected]>