Merge "Restructured keystore2 client tests." am: a00741ceb6

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

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