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

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

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