Merge "Adding Keystore2 version gate >=4 for the below recently added tests." into main am: fa0d11f149

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

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