Merge "Updated CTS test for Android Security b/199754277" into rvc-dev am: 64fa53bdfd

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

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