Merge "Add keystore2_client_tests" into main am: 651dabeff3

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

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