Merge "Updated CTS test for Android Security b/228450811" into rvc-dev am: f38b01e20b am: 7599f3d97f am: 0095debcdc

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

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