Merge "Adjust keystore2_client_tests" into main am: e85693c603

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

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