Merge "Adds coretests/android/service tests to presubmit" into main