[automerger skipped] Merge "CTS test for Android Security b/229256049" into tm-dev am: 122a9b4 am: adc36fb am: 99ff1e1 -s ours am: 1af132c -s ours am: bed80b8 -s ours

am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 8b3857a is already in history

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

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

Author: Treehugger Robot