Merge android12L-tests-dev@8941410 am: 672f417969 am: 6128803e42

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

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