Merge "Updated CTS test for Android Security b/174495520" into rvc-dev am: 9fce077fe1 am: 28e02d2c0a am: aa3ceadb66

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

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