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