[automerger skipped] [conflict] Merge "CTS test for Android Security b/179042963" into rvc-dev am: 2247a7b am: c6da1b5 am: 8dc430a am: 32562e3 -s ours

am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521d is already in history

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

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

Author: Treehugger Robot