Merge "Adjust keystore2_client_tests" into main am: e85693c603 am: 8ab274bd3c

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

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