[automerger skipped] Merge ab/7633965 am: f83ff19c6c -s ours

am skip reason: Merged-In Ie08bf3851aefeb4f6acdb5d64f7ad5c678908f3d with SHA-1 10bed653b3 is already in history

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

Change-Id: Ie5b598ac00dc4b82ea487dba972a7944b2301e5e