Merge "Moving keystore2_client_tests to presubmit." into main