Merge "Add keystore2_client_tests" into main am: 651dabeff3 am: 22778ec75b

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

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