Merge "Moving keystore2_client_tests to presubmit." into main am: a2621b4d6c

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3261035

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