Merge "Skip GKI 2.0 test for devices launched before S" am: d6ac1d1c7c am: 99e038276d am: a54755a9d1

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2064951

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