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

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

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