[automerger skipped] Merge "CTS test for Android Security b/229256049" into sc-dev am: a1ca3a6 am: 51b84df -s ours am: 78e0620 -s ours am: cfb2cc1 -s ours

am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 4cfa262 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/20516245

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

Author: Treehugger Robot