Merge "Skip GKI 2.0 test for devices launched before S" am: d6ac1d1c7c am: 99e038276d am: a54755a9d1 am: 4aaff3abca am: b2ecc577a7 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2064951 Change-Id: I30bab7685181610e90846a822042f592d3a158fa Signed-off-by: Automerger Merge Worker <[email protected]>