Android mainline 12.0.0 release 4
Merge "Update s2-geometry-library-java-tests to not run in TEST_MAPPING" into sc-dev